fix script that upload AppImage to go in correct path

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

diff --git a/.drone.yml b/.drone.yml
index 5902cfbabbc28ef54b9a8e175b5fa9593b387d1f..60eadb59f4f6b6c4b1f3045f90c513f2d1cb6150 100644 (file)
--- a/.drone.yml
+++ b/.drone.yml
@@ -106,7 +106,7 @@ steps:
       from_secret: CI_UPLOAD_GIT_USERNAME
   commands:
     - BUILDNR=$DRONE_BUILD_NUMBER VERSION_SUFFIX=$DRONE_PULL_REQUEST BUILD_UPDATER=ON DESKTOP_CLIENT_ROOT=$DRONE_WORKSPACE /bin/bash -c "./admin/linux/build-appimage.sh"
-    - /bin/bash -c "./admin/linux/upload-appimage.sh" || echo "Upload failed, however this is an optional step."
+    - DESKTOP_CLIENT_ROOT=$DRONE_WORKSPACE /bin/bash -c "./admin/linux/upload-appimage.sh" || echo "Upload failed, however this is an optional step."
 trigger:
   branch:
     - master

diff --git a/admin/linux/upload-appimage.sh b/admin/linux/upload-appimage.sh
index db36e845438de619e434d81f0967d6458c60674e..42f1f563f2d6c74ebd8c243e16b1969c2182923a 100755 (executable)
--- a/admin/linux/upload-appimage.sh
+++ b/admin/linux/upload-appimage.sh
@@ -5,6 +5,7 @@ export BUILD=${DRONE_BUILD_NUMBER}
 export PR=${DRONE_PULL_REQUEST}
 export GIT_USERNAME=${CI_UPLOAD_GIT_USERNAME}
 export GIT_TOKEN=${CI_UPLOAD_GIT_TOKEN}
+export DESKTOP_CLIENT_ROOT=${DESKTOP_CLIENT_ROOT:-/home/user}
 
 # Defaults
 export GIT_REPO=ci-builds
@@ -20,7 +21,7 @@ if [ $TAG_NAME != "master" ]; then
     RELEASE_BODY="nextcloud/desktop#$PR"
 fi
 
-cd /build
+cd ${DESKTOP_CLIENT_ROOT}
 
 # AppImage
 export APPIMAGE=$(readlink -f ./Nextcloud*.AppImage)