diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 6d399647..22aeefb5 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -80,16 +80,11 @@ jobs: chmod +x appimagetool-x86_64.AppImage ARCH=x86_64 ./appimagetool*.AppImage -n guiscrcpy.AppDir ./guiscrcpy*.AppImage --appimage-extract - cd squashfs-root/scrcpy - wget https://github.com/AppImageCrafters/AppRun/releases/download/v1.1.2/AppRun-amd64 -O AppRun && chmod +x AppRun - wget https://github.com/AppImageCrafters/AppRun/releases/download/v1.1.2/libapprun_hooks-amd64.so -O libapprun_hooks.so && chmod +x libapprun_hooks.so - cd ../.. - cp pyappimage/.env.template squashfs-root/scrcpy/.env wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage chmod +x appimagetool-x86_64.AppImage - ./appimagetool*.AppImage squashfs-root -n -u 'gh-releases-zsync|srevinsaju|guiscrcpy|continuous|guiscrcpy*.AppImage.zsync' guiscrcpy-$(git describe --tags --match '[0-9]*')-$(uname -m).AppImage + ./appimagetool*.AppImage squashfs-root -n -u 'gh-releases-zsync|srevinsaju|guiscrcpy|continuous|guiscrcpy*.AppImage.zsync' guiscrcpy-$(git describe --tags --match '*[0-9]*')-$(uname -m).AppImage mkdir dist - mv guiscrcpy-$(git describe --tags --match '[0-9]*')-$(uname -m).AppImage* dist/. + mv guiscrcpy-$(git describe --tags --match '*[0-9]*')-$(uname -m).AppImage* dist/. - name: Install Destop Environment diff --git a/pyappimage/pyappimage.yml b/pyappimage/pyappimage.yml index 5f1cb2a5..8296a4f5 100644 --- a/pyappimage/pyappimage.yml +++ b/pyappimage/pyappimage.yml @@ -8,11 +8,10 @@ data: $CWD/pyappimage/hooks/cssselect2: $APPIMAGE/guiscrcpy/cssselect2 $CWD/pyappimage/hooks/cairocffi: $APPIMAGE/guiscrcpy/cairocffi $CWD/pyappimage/hooks/VERSION: $APPIMAGE/guiscrcpy/ - $CWD/pyappimage/scrcpy: $APPIMAGE/scrcpy/ environment: QT_API: pyside2 - GUISCRCPY_SCRCPY: ${APPDIR}/scrcpy/scrcpy + GUISCRCPY_SCRCPY: ${APPDIR}/scrcpy/usr/bin/scrcpy GUISCRCPY_ADB: ${APPDIR}/scrcpy/usr/bin/adb SCRCPY_SERVER_PATH: ${APPDIR}/scrcpy/usr/local/share/scrcpy/scrcpy-server ADB: ${APPDIR}/scrcpy/usr/bin/adb