From fc9c3eadefeec9f22ecdd0b43af1718b3b40a3e3 Mon Sep 17 00:00:00 2001 From: tresf Date: Sat, 24 Feb 2018 02:49:08 -0500 Subject: [PATCH] Fix the AppImages --- cmake/linux/package_linux.sh.in | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/cmake/linux/package_linux.sh.in b/cmake/linux/package_linux.sh.in index 19c9823de..60442aff0 100644 --- a/cmake/linux/package_linux.sh.in +++ b/cmake/linux/package_linux.sh.in @@ -8,9 +8,7 @@ set -e -USERBIN="$HOME/bin" -LINUXDEPLOYQT="$USERBIN/linuxdeployqt" -APPIMAGETOOL="$USERBIN/appimagetool" +LINUXDEPLOYQT="@CMAKE_BINARY_DIR@/linuxdeployqt" VERBOSITY=2 # 3=debug LOGFILE="@CMAKE_BINARY_DIR@/appimage.log" APPDIR="@CMAKE_BINARY_DIR@/@PROJECT_NAME_UCASE@.AppDir/" @@ -71,12 +69,8 @@ elif ! find "$LINUXDEPLOYQT" -mtime -$DAYSOLD 2>/dev/null|grep -q "." > /dev/nul touch "$LINUXDEPLOYQT" success "Downloaded $LINUXDEPLOYQT" "$LINUXDEPLOYQT" --appimage-extract > /dev/null 2>&1 - mv "squashfs-root/usr/bin/appimagetool" "$APPIMAGETOOL" + APPIMAGETOOL="squashfs-root/usr/bin/appimagetool" success "Extracted $APPIMAGETOOL" - mv "squashfs-root/usr/bin/mksquashfs" "$USERBIN/mksquashfs" - success "Extracted $USERBIN/mksquashfs" - rm -rf "squashfs-root/" - else skipped "$LINUXDEPLOYQT is less than $DAYSOLD days old" fi