From dd0135ce2e6bf7105534efe958de35709ebe8114 Mon Sep 17 00:00:00 2001 From: Michael Schuster Date: Sat, 16 Nov 2019 21:34:13 +0100 Subject: [PATCH] Move .desktop file path to new env var to avoid duplicates Signed-off-by: Michael Schuster --- admin/linux/build-appimage.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/admin/linux/build-appimage.sh b/admin/linux/build-appimage.sh index 3c5b26c97..7ea22bf52 100755 --- a/admin/linux/build-appimage.sh +++ b/admin/linux/build-appimage.sh @@ -69,7 +69,8 @@ rm -rf ./usr/share/nemo-python/ mv ./etc/Nextcloud/sync-exclude.lst ./usr/bin/ rm -rf ./etc -sed -i -e 's|Icon=nextcloud|Icon=Nextcloud|g' usr/share/applications/${LINUX_APPLICATION_ID}.desktop # Bug in desktop file? +DESKTOP_FILE=/app/usr/share/applications/${LINUX_APPLICATION_ID}.desktop +sed -i -e 's|Icon=nextcloud|Icon=Nextcloud|g' ${DESKTOP_FILE} # Bug in desktop file? cp ./usr/share/icons/hicolor/512x512/apps/Nextcloud.png . # Workaround for linuxeployqt bug, FIXME @@ -90,13 +91,13 @@ chmod a+x linuxdeployqt*.AppImage rm ./linuxdeployqt-continuous-x86_64.AppImage unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH export LD_LIBRARY_PATH=/app/usr/lib/ -./squashfs-root/AppRun /app/usr/share/applications/${LINUX_APPLICATION_ID}.desktop -bundle-non-qt-libs +./squashfs-root/AppRun ${DESKTOP_FILE} -bundle-non-qt-libs # Set origin ./squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/' /app/usr/lib/libnextcloudsync.so.0 # Build AppImage -./squashfs-root/AppRun /app/usr/share/applications/${LINUX_APPLICATION_ID}.desktop -appimage +./squashfs-root/AppRun ${DESKTOP_FILE} -appimage mv Nextcloud*.AppImage Nextcloud-${SUFFIX}-${DRONE_COMMIT}-x86_64.AppImage -- 2.30.2