diff --git a/.github/workflows/scripts/linux/appimage-qt.sh b/.github/workflows/scripts/linux/appimage-qt.sh index d22a635b50..2400954987 100755 --- a/.github/workflows/scripts/linux/appimage-qt.sh +++ b/.github/workflows/scripts/linux/appimage-qt.sh @@ -63,9 +63,9 @@ declare -a REMOVE_LIBS=( set -e -LINUXDEPLOY=./linuxdeploy-x86_64 -LINUXDEPLOY_PLUGIN_QT=./linuxdeploy-plugin-qt-x86_64 -APPIMAGETOOL=./appimagetool-x86_64 +LINUXDEPLOY=./linuxdeploy-x86_64.AppImage +LINUXDEPLOY_PLUGIN_QT=./linuxdeploy-plugin-qt-x86_64.AppImage +APPIMAGETOOL=./appimagetool-x86_64.AppImage PATCHELF=patchelf if [ ! -f "$LINUXDEPLOY" ]; then @@ -78,11 +78,8 @@ if [ ! -f "$LINUXDEPLOY_PLUGIN_QT" ]; then chmod +x "$LINUXDEPLOY_PLUGIN_QT" fi -# Using go-appimage -# Backported from https://github.com/stenzek/duckstation/pull/3251 if [ ! -f "$APPIMAGETOOL" ]; then - APPIMAGETOOLURL=$(wget -q https://api.github.com/repos/probonopd/go-appimage/releases -O - | sed 's/[()",{} ]/\n/g' | grep -o 'https.*continuous.*tool.*86_64.*mage$' | head -1) - "$PCSX2DIR/tools/retry.sh" wget -O "$APPIMAGETOOL" "$APPIMAGETOOLURL" + "$PCSX2DIR/tools/retry.sh" wget -O "$APPIMAGETOOL" https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage chmod +x "$APPIMAGETOOL" fi @@ -213,5 +210,4 @@ if [[ "${GIT_VERSION}" == "" ]]; then fi rm -f "$NAME.AppImage" -ARCH=x86_64 VERSION="${GIT_VERSION}" "$APPIMAGETOOL" -s "$OUTDIR" && mv ./*.AppImage "$NAME.AppImage" - +$APPIMAGETOOL -v "$OUTDIR" "$NAME.AppImage"