diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 88feebe..a3e63be 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,7 +51,7 @@ jobs: if: matrix.platform == 'ubuntu-22.04' || matrix.platform == 'ubuntu-22.04-arm' # This must match the platform value defined above. run: | sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf + sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf binutils # webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2. @@ -102,7 +102,7 @@ jobs: prerelease: true args: ${{ matrix.args }} - - name: Bundle Appimage + - name: Bundle AppImage if: matrix.platform == 'ubuntu-22.04' || matrix.platform == 'ubuntu-22.04-arm' - run: - build_appimage.sh --nobuild + run: | + ./build_appimage.sh --nobuild diff --git a/.gitignore b/.gitignore index 5767a3f..52149c9 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,8 @@ dist-ssr .output src-tauri/flamegraph.svg -src-tauri/perf* \ No newline at end of file +src-tauri/perf* + +build/appimage/* +!build/appimage/drop-app.d +drop-app diff --git a/build/appimage/drop-app.d/usr/bin/.execs_go_here b/build/appimage/drop-app.d/usr/bin/.gitkeep similarity index 100% rename from build/appimage/drop-app.d/usr/bin/.execs_go_here rename to build/appimage/drop-app.d/usr/bin/.gitkeep diff --git a/build/appimage/drop-app.d/usr/lib/.libs_go_here b/build/appimage/drop-app.d/usr/lib/.gitkeep similarity index 100% rename from build/appimage/drop-app.d/usr/lib/.libs_go_here rename to build/appimage/drop-app.d/usr/lib/.gitkeep diff --git a/build_appimage.sh b/build_appimage.sh index c4d080d..5d281a9 100755 --- a/build_appimage.sh +++ b/build_appimage.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e # run this from the root of the git repo to make this work @@ -21,14 +22,14 @@ build() { rm -f $appdir/usr/bin/* $appdir/usr/lib/* if [[ ! "$1" == "--nobuild" ]]; then - build + build fi # install binaries in the appdir, then the libraries cp $target_dir/release/drop-app $appdir/usr/bin -for i in $(readelf -d "$target_dir/release/drop-app" |grep NEEDED |cut -d'[' -f2 |tr -d ]); +for i in $(readelf -d "$target_dir/release/drop-app" | grep NEEDED |cut -d'[' -f2 |tr -d ]); do - install -g 1000 -o 1000 -Dm755 "$(ls -L1 /usR/LIB/$i)" $appdir/usr/lib + install -g 1000 -o 1000 -Dm755 "$(ls -L1 /usr/lib/$i)" $appdir/usr/lib done wget -O $appimage_dir/appimagetool https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-$arch.AppImage