From 70b5e6fdb746c427022a6935cbccbeb8b909b601 Mon Sep 17 00:00:00 2001 From: "Ben Scholzen (DASPRiD)" Date: Sat, 27 Jun 2020 19:26:25 +0200 Subject: [PATCH] Implement suggested feedback --- build_scripts/linux/appimage.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/build_scripts/linux/appimage.sh b/build_scripts/linux/appimage.sh index 8b70840..6962357 100755 --- a/build_scripts/linux/appimage.sh +++ b/build_scripts/linux/appimage.sh @@ -39,12 +39,17 @@ cp $PROJECT_DIR/src/res/img/icons/thumbicon.png $EXE_DIR/usr/share/icons/hicolor cp $PROJECT_DIR/src/package_files/linux/AdvancedSettings.desktop $EXE_DIR/usr/share/applications/AdvancedSettings.desktop -if [ "$1" == "steam" ]; then - echo "X-AppImage-Integrate=false" >> $EXE_DIR/usr/share/applications/AdvancedSettings.desktop -fi - qmake --version $PROJECT_DIR/linuxdeployqt-continuous-x86_64.AppImage -version --appimage-extract-and-run -$PROJECT_DIR/linuxdeployqt-continuous-x86_64.AppImage $EXE_DIR/usr/share/applications/AdvancedSettings.desktop --appimage-extract-and-run -appimage -verbose=2 -always-overwrite -qmldir=$PROJECT_DIR/src/res/qml -exclude-libs=libxcb-randr.so.0,libxkbcommon-x11.so.0 +APPIMAGE_COMMAND="$PROJECT_DIR/linuxdeployqt-continuous-x86_64.AppImage $EXE_DIR/usr/share/applications/AdvancedSettings.desktop --appimage-extract-and-run -appimage -verbose=2 -always-overwrite -qmldir=$PROJECT_DIR/src/res/qml -exclude-libs=libxcb-randr.so.0,libxkbcommon-x11.so.0" + +$APPIMAGE_COMMAND + +# Disable AppImageLauncher integration for Steam versions +echo "X-AppImage-Integrate=false" >> $EXE_DIR/usr/share/applications/AdvancedSettings.desktop +export VERSION="$(git rev-parse --short HEAD)-STEAM" + +$APPIMAGE_COMMAND +