From b654633aad515098f36ec012b6c338357c67b3d9 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sat, 9 Mar 2024 13:00:08 -0500
Subject: [PATCH 1/2] Fix paths to use incoming and sudo move

Aligns with new permissions model on new repo server.
---
 .github/workflows/app-publish.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/app-publish.yaml b/.github/workflows/app-publish.yaml
index b2c56af14..f7232b034 100644
--- a/.github/workflows/app-publish.yaml
+++ b/.github/workflows/app-publish.yaml
@@ -79,7 +79,7 @@ jobs:
         with:
           switches: -vrptz
           path: build/jellyfin-publish/
-          remote_path: /srv/repository/main/client/android/versions/v${{ env.JELLYFIN_VERSION }}
+          remote_path: /srv/incoming/android/v${{ env.JELLYFIN_VERSION }}/
           remote_host: ${{ secrets.REPO_HOST }}
           remote_user: ${{ secrets.REPO_USER }}
           remote_key: ${{ secrets.REPO_KEY }}
@@ -92,7 +92,8 @@ jobs:
           envs: JELLYFIN_VERSION
           script_stop: true
           script: |
+            sudo mv /srv/incoming/android/v${{ env.JELLYFIN_VERSION }} /srv/repository/main/client/android/versions/v${{ env.JELLYFIN_VERSION }}
             cd /srv/repository/main/client/android;
-            rm -rf *.apk version.txt;
-            ln -s versions/v${JELLYFIN_VERSION}/jellyfin-android-v${JELLYFIN_VERSION}-*.apk .;
-            ln -s versions/v${JELLYFIN_VERSION}/version.txt .;
+            sudo rm -rf *.apk version.txt;
+            sudo ln -s versions/v${JELLYFIN_VERSION}/jellyfin-android-v${JELLYFIN_VERSION}-*.apk .;
+            sudo ln -s versions/v${JELLYFIN_VERSION}/version.txt .;

From 3090ae2513b66fd0ec04af30b46ea21bd33bfd37 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sat, 9 Mar 2024 13:17:05 -0500
Subject: [PATCH 2/2] Remove a target dir if it exists

Helps with potential tag overwrites should they occur.
---
 .github/workflows/app-publish.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/app-publish.yaml b/.github/workflows/app-publish.yaml
index f7232b034..358679a6c 100644
--- a/.github/workflows/app-publish.yaml
+++ b/.github/workflows/app-publish.yaml
@@ -92,6 +92,9 @@ jobs:
           envs: JELLYFIN_VERSION
           script_stop: true
           script: |
+            if [ -d "/srv/repository/main/client/android/versions/v${{ env.JELLYFIN_VERSION }}" ] && [ -n "${{ env.JELLYFIN_VERSION }}" ]; then
+                sudo rm -r /srv/repository/main/client/android/versions/v${{ env.JELLYFIN_VERSION }}
+            fi
             sudo mv /srv/incoming/android/v${{ env.JELLYFIN_VERSION }} /srv/repository/main/client/android/versions/v${{ env.JELLYFIN_VERSION }}
             cd /srv/repository/main/client/android;
             sudo rm -rf *.apk version.txt;