Fix the AppImages

Author: tresf

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