change metadata

.gitea/workflows/release.yml

@@ -86,32 +86,29 @@ jobs:
         if: env.CONTINUE == 'true'
         run: |
           LICENSE="MIT"
+          AUTHOR="Alex Denisov"
+          ICON="repo/icons/app_icon.png"
           mkdir -p fdroid-repo/repo fdroid-repo/metadata fdroid-repo/repo/icons
-          echo "${{ secrets.FDROID_KEYSTORE_BASE64 }}" | base64 -d > fdroid-repo/keystore.p12
-          for apk in app/build/outputs/apk/release/*.apk; do
-            APPID=$(grep 'applicationId' app/build.gradle | awk -F '"' '{print $2}')
-            VERSION=${{ steps.extract_version.outputs.version }}
-            NEW_NAME="${APPID}_${VERSION}.apk"
           
+          # Декодируем keystore
+          echo "${{ secrets.FDROID_KEYSTORE_BASE64 }}" | base64 -d > fdroid-repo/keystore.p12
+          
+          # Получаем APPID и версию
+          APPID=$(grep 'applicationId' app/build.gradle | awk -F '"' '{print $2}')
+          VERSION=${{ steps.extract_version.outputs.version }}
+          VERSION_CODE=$(echo $VERSION | awk -F. '{ printf("%d%02d%02d", $1,$2,$3 ? $3 : 0); }')
+          
+          # Копируем APK и иконки
+          for apk in app/build/outputs/apk/release/*.apk; do
+            NEW_NAME="${APPID}_${VERSION}.apk"
             cp "$apk" "fdroid-repo/repo/$NEW_NAME"
           done
-  
           cp assets/icon.png fdroid-repo/repo/icons/icon.png
           cp assets/app_icon.png fdroid-repo/repo/icons/app_icon.png
           
-          APPID=$(grep 'applicationId' app/build.gradle | awk -F '"' '{print $2}')
+          # Генерируем metadata
-          VERSION_CODE=$(echo $VERSION | awk -F. '{ printf("%d%02d%02d", $1,$2,$3 ? $3 : 0); }')
-
-          LICENSE="MIT"
-          AUTHOR="Alex Denisov"
-          ICON="repo/icons/app_icon.png"
-      
-          mkdir -p fdroid-repo/metadata
-      
           for apk in fdroid-repo/repo/*.apk; do
             FILENAME=$(basename "$apk")
-            VERSION=$(echo "$FILENAME" | sed -E 's/.*_(.*)\.apk$/\1/')
-            VERSION_CODE=$(echo $VERSION | awk -F. '{ printf("%d%02d%02d", $1,$2,$3 ? $3 : 0); }')
             SHA256=$(sha256sum "$apk" | awk '{print $1}')
           
             printf '%s\n' \
@@ -119,8 +116,7 @@ jobs:
               "AuthorName: $AUTHOR" \
               "Categories:" \
               "  - Internet" \
-              "SourceCode: https://github.com/example/$APPID" \
+              "SourceCode: https://git.daemonlord.ru/benya/AnabasisChatManager-android" \
-              "Icon: $ICON" \
               "" \
               "Builds:" \
               "  - versionName: $VERSION" \
@@ -135,7 +131,6 @@ jobs:
               "AutoUpdateMode: Version %v" \
               "UpdateCheckMode: Tags" \
             > "fdroid-repo/metadata/$APPID.yml"
-          done
 
       # ------------------- Generate F-Droid config.yml -------------------
       - name: Generate F-Droid config.yml
@@ -146,9 +141,7 @@ jobs:
           REPO_URL="https://fdroid.daemonlord.ru/fdroid/repo"
           REPO_NAME="Anabasis F-Droid Repo"
           REPO_DESC="Automatically generated F-Droid repository"
-          REPO_ICON="icon.png"
+          REPO_ICON="repo/icons/icon.png"
-
-          mkdir -p fdroid-repo
           
           printf '%s\n' \
             "repo_url: $REPO_URL" \
@@ -161,7 +154,6 @@ jobs:
             "repo_icon: $REPO_ICON" \
           > fdroid-repo/config.yml
           
-          # Защищаем файл
           chmod 600 fdroid-repo/config.yml
 
       # ------------------- Generate F-Droid Index -------------------
@@ -174,13 +166,11 @@ jobs:
           ls -la fdroid-repo/repo/icons
           echo "=== config.yml ==="
           cat fdroid-repo/config.yml
-          echo "=== keystore ==="
-          ls -la fdroid-repo/keystore.p12
-          cat fdroid-repo/config.yml
           cd fdroid-repo
-          fdroid update --clean --nosign --verbose
+          fdroid update --clean --verbose
           cd ..
 
+
       # ------------------- Git tag -------------------
       - name: Create git tag
         if: env.CONTINUE == 'true'