From bc7e645e158c134b36844c7bd6f17ba50a627e1d Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Wed, 23 Mar 2022 15:09:36 +0100 Subject: [PATCH] try to fix path inside appimage packages Signed-off-by: Matthieu Gallien --- admin/linux/build-appimage.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/admin/linux/build-appimage.sh b/admin/linux/build-appimage.sh index e88577b5a..30f531577 100755 --- a/admin/linux/build-appimage.sh +++ b/admin/linux/build-appimage.sh @@ -32,9 +32,9 @@ cd qtkeychain git checkout v0.10.0 mkdir build cd build -cmake -G Ninja -D CMAKE_INSTALL_PREFIX=/app/usr .. +cmake -G Ninja -D CMAKE_INSTALL_PREFIX=/usr .. cmake --build . --target all -cmake --build . --target install +cmake --install . --prefix /app/usr # Build client @@ -42,14 +42,16 @@ mkdir build-client cd build-client cmake \ -G Ninja \ - -D CMAKE_INSTALL_PREFIX=/app/usr \ + -D CMAKE_INSTALL_PREFIX=/usr \ -D BUILD_TESTING=OFF \ -D BUILD_UPDATER=$BUILD_UPDATER \ -D MIRALL_VERSION_BUILD=$BUILDNR \ -D MIRALL_VERSION_SUFFIX="$VERSION_SUFFIX" \ ${DESKTOP_CLIENT_ROOT} cmake --build . --target all -cmake --build . --target install +cmake --install . --prefix /app/usr +mkdir -p /app/usr/etc/Nextcloud +mv /etc/Nextcloud/sync-exclude.lst /app/usr/etc/Nextcloud/sync-exclude.lst # Move stuff around cd /app @@ -96,7 +98,7 @@ chmod a+x linuxdeployqt*.AppImage ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract rm ./linuxdeployqt-continuous-x86_64.AppImage unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH -export LD_LIBRARY_PATH=/app/usr/lib/ +export LD_LIBRARY_PATH=/usr/lib/ ./squashfs-root/AppRun ${DESKTOP_FILE} -bundle-non-qt-libs -qmldir=${DESKTOP_CLIENT_ROOT}/src/gui # Set origin -- 2.30.2