diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a35e8fa..4f71405 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v2 - name: Install dependencies - run: sudo apt-get install -y libgrantlee5-dev qt5-default qtdeclarative5-dev-tools + run: sudo apt-get install -y libgrantlee5-dev qt6-base-dev qt6-base-dev-tools qt6-declarative-dev qt6-declarative-dev-tools - name: Lint test script run: shellcheck ./tests/test-plugins.sh diff --git a/gdb/linuxdeploy-plugin-gdb.sh b/gdb/linuxdeploy-plugin-gdb.sh index 6fa1d13..f6beb57 100755 --- a/gdb/linuxdeploy-plugin-gdb.sh +++ b/gdb/linuxdeploy-plugin-gdb.sh @@ -3,9 +3,11 @@ # exit whenever a command called in this script fails set -e + +verbose=() if [ "$DEBUG" != "" ]; then set -x - verbose="--verbose" + verbose+=("--verbose") fi appdir="" @@ -55,7 +57,7 @@ if [ -z "$LINUXDEPLOY_PLUGIN_GDB_SRC" ]; then fi echo "Copying source files" -cp --recursive $verbose "$LINUXDEPLOY_PLUGIN_GDB_SRC" "$appdir/usr/" +cp --recursive "${verbose[@]}" "$LINUXDEPLOY_PLUGIN_GDB_SRC" "$appdir/usr/" echo "Installing new AppRun wrapper" # AppRun script does: exec "$this_dir"/AppRun.wrapped "$@" @@ -63,7 +65,7 @@ echo "Installing new AppRun wrapper" # AppRun.wrapped.orig is the real application old_exe="$(readlink -f "$appdir/AppRun.wrapped")" new_exe="$old_exe.orig" -mv $verbose "$old_exe" "$new_exe" +mv "${verbose[@]}" "$old_exe" "$new_exe" cat > "$old_exe" <