minor correction

Reviewed-on: #1

.drone.yml

@@ -10,7 +10,7 @@ steps:
 - name: clone-repo
   image: alpine/git:latest
   commands:
-    - git clone https://gitea.akshun-lab.uk/akshun/python-setup.git /artifacts
+    - git clone https://gitea.akshun-lab.cc/aggarwalakshun/python-setup.git /artifacts
   volumes:
     - name: artifacts
       path: /artifacts
@@ -61,59 +61,32 @@ steps:
       path: /artifacts
 
 - name: upload-artifacts
-  image: alpine/curl:latest
+  image: alpine:latest
   depends_on: [arch-build, debian-build, fedora-build]
   commands:
-    - apk add --no-cache curl jq
+    - apk add jq curl
     - |
-      if [ -z "$GITEA_TOKEN" ] || [ -z "$GITEA_SERVER" ]; then
+      # Get the latest release information
-        echo "Error: GITEA_TOKEN or GITEA_SERVER not set"
+      RELEASE_INFO=$(curl -s "https://gitea.akshun-lab.cc/api/v1/repos/aggarwalakshun/python-setup/releases/latest")
-        exit 1
+      LATEST_TAG=$(echo "$RELEASE_INFO" | jq -r '.tag_name')
-      fi
+      RELEASE_ID=$(echo "$RELEASE_INFO" | jq -r '.id')
       
-      REPO_PATH="${DRONE_REPO:-akshun/python-script}"
+      echo "Latest tag: $LATEST_TAG"
+      echo "Release ID: $RELEASE_ID"
 
-      if [ -n "${DRONE_TAG}" ]; then
+      for file in /artifacts/*-setup; do
-        echo "Creating release for tag ${DRONE_TAG}"
+        FILENAME=$(basename "$file")
-        response=$(curl -s -X POST \
+        echo "Uploading $FILENAME..."
+        
+        # Use the release ID instead of tag name in the URL
+        curl -X POST "https://gitea.akshun-lab.cc/api/v1/repos/aggarwalakshun/python-setup/releases/$RELEASE_ID/assets?name=$FILENAME" \
           -H "Authorization: token $GITEA_TOKEN" \
-          -H "Content-Type: application/json" \
+          -H "Content-Type: application/octet-stream" \
-          -d '{"tag_name": "'"${DRONE_TAG}"'", "name": "'"${DRONE_TAG}"'", "body": "Automated release"}' \
+          --data-binary @"$file"
-          "$GITEA_SERVER/api/v1/repos/$REPO_PATH/releases")
-        release_id=$(echo "$response" | jq -r '.id')
-      else
-        echo "Using latest release"
-        response=$(curl -s -H "Authorization: token $GITEA_TOKEN" \
-          "$GITEA_SERVER/api/v1/repos/$REPO_PATH/releases/latest" || echo "")
-        
-        if [ -z "$response" ] || [ "$(echo "$response" | jq -r '.id')" = "null" ]; then
-          echo "Creating new draft release"
-          response=$(curl -s -X POST \
-            -H "Authorization: token $GITEA_TOKEN" \
-            -H "Content-Type: application/json" \
-            -d '{"tag_name": "continuous", "name": "Continuous Build", "draft": true, "body": "Automated continuous build"}' \
-            "$GITEA_SERVER/api/v1/repos/$REPO_PATH/releases")
-        fi
-        
-        release_id=$(echo "$response" | jq -r '.id')
-      fi
-
-      for artifact in /artifacts/*-setup; do
-        if [ -f "$artifact" ]; then
-          filename=$(basename "$artifact")
-          echo "Uploading $filename"
-          curl -X POST \
-            -H "Authorization: token $GITEA_TOKEN" \
-            -H "Content-Type: multipart/form-data" \
-            -F "attachment=@$artifact" \
-            "$GITEA_SERVER/api/v1/repos/$REPO_PATH/releases/$release_id/assets?name=$filename"
-        fi
       done
   environment:
     GITEA_TOKEN:
-      from_secret: gitea-token
+      from_secret: GITEA_TOKEN
-    GITEA_SERVER:
-      from_secret: gitea-server
   volumes:
     - name: artifacts
       path: /artifacts

.gitea/workflows/release.yml

@@ -0,0 +1,76 @@
+name: Multi Distro Build
+
+on: workflow_dispatch
+
+jobs:
+  arch-build:
+    runs-on: ubuntu-latest
+    container: archlinux:latest
+    steps:
+      - name: Install node
+        run: pacman -Syu --noconfirm nodejs npm
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          pacman -S --noconfirm git python python-pip binutils
+          mv /lib/python3*/EXTERNALLY-MANAGED /tmp/
+          pip install --upgrade pip
+          pip install pyinstaller inquirerpy distro
+      - name: Build binary
+        run: |
+          pyinstaller --onefile --add-data "data/:data/" setup.py
+          cp dist/setup arch-setup
+        shell: bash
+      - name: Release binary
+        uses: akkuman/gitea-release-action@v1
+        with:
+          files: |-
+            arch-setup
+
+  debian-build:
+    runs-on: ubuntu-latest
+    container: debian:stable-slim
+    steps:
+      - name: Install node
+        run: apt-get update && apt-get upgrade -y && apt-get install -y nodejs npm
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          apt-get install -y git python3 python3-pip binutils
+          mv /usr/lib/python*/EXTERNALLY-MANAGED /tmp/
+          pip install pyinstaller inquirerpy distro
+      - name: Build binary
+        run: |
+          pyinstaller --onefile --add-data "data/:data/" setup.py
+          cp dist/setup debian-setup
+        shell: bash
+      - name: Release binary
+        uses: akkuman/gitea-release-action@v1
+        with:
+          files: |-
+            debian-setup
+
+  fedora-build:
+    runs-on: ubuntu-latest
+    container: fedora:latest
+    steps:
+      - name: Install node
+        run: dnf up -y && dnf install -y nodejs npm
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          dnf install -y git python python-pip binutils
+          pip install inquirerpy distro pyinstaller
+      - name: Build binary
+        run: |
+          pyinstaller --onefile --add-data "data/:data/" setup.py
+          cp dist/setup fedora-setup
+        shell: bash
+      - name: Release binary
+        uses: akkuman/gitea-release-action@v1
+        with:
+          files: |-
+            fedora-setup

setup.py

@@ -289,6 +289,6 @@ def install_other():
     selected_other = menu2
 
     for other in selected_other:
-        os.system(f"bash {dir}data/scripts/third-party/" + other + ".sh")
+        os.system(f"bash {dir}data/scripts/" + other + ".sh")
 
 menu()