From 0da62514c150d6f62367d712510c7b034fa84b70 Mon Sep 17 00:00:00 2001 From: cmuck Date: Thu, 21 Nov 2024 14:50:22 +0100 Subject: [PATCH] Fix login regression on linux Signed-off-by: cmuck --- admin/linux/build-appimage.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/admin/linux/build-appimage.sh b/admin/linux/build-appimage.sh index 2923a2c227e0f..5fbd6c3d0c381 100755 --- a/admin/linux/build-appimage.sh +++ b/admin/linux/build-appimage.sh @@ -91,12 +91,19 @@ export QML_SOURCES_PATHS=${DESKTOP_CLIENT_ROOT}/src/gui ./linuxdeploy-squashfs-root/AppRun --desktop-file=${DESKTOP_FILE} --icon-file=usr/share/icons/hicolor/512x512/apps/Nextcloud.png --executable=usr/bin/${EXECUTABLE_NAME} --appdir=AppDir --output appimage # Workaround issue #103 and #7231 +export APPIMAGETOOL=appimagetool-x86_64.AppImage +wget -O ${APPIMAGETOOL} --ca-directory=/etc/ssl/certs -c https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage +chmod a+x ${APPIMAGETOOL} +rm -rf ./squashfs-root +./${APPIMAGETOOL} --appimage-extract +rm ./${APPIMAGETOOL} +cp -r ./squashfs-root ./appimagetool-squashfs-root rm -rf ./squashfs-root APPIMAGE=$(ls *.AppImage) -"./${APPIMAGE}" --appimage-extract -rm "./${APPIMAGE}" +./"${APPIMAGE}" --appimage-extract +rm ./"${APPIMAGE}" rm ./squashfs-root/usr/lib/libglib-2.0.so.0 -PATH=./linuxdeployqt-squashfs-root/usr/bin:$PATH appimagetool -n ./squashfs-root "$APPIMAGE" +LD_LIBRARY_PATH="$PWD/appimagetool-squashfs-root/usr/lib":$LD_LIBRARY_PATH PATH="$PWD/appimagetool-squashfs-root/usr/bin":$PATH appimagetool -n ./squashfs-root "${APPIMAGE}" #move AppImage if [ ! -z "$DRONE_COMMIT" ]