From 531be1272bc6ac28aaa8ca01a5ff46845e4e7076 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Sun, 14 Dec 2025 20:41:06 +0100 Subject: [PATCH 1/4] Replace Qt 5 with Qt 6 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From e4882aaa435aadf3e7bf1a7c9d5cbf51e5bea75f Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Sun, 14 Dec 2025 20:47:01 +0100 Subject: [PATCH 2/4] Fix shellcheck false positive --- tests/test-plugins.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test-plugins.sh b/tests/test-plugins.sh index 3130b35..c6fcfac 100755 --- a/tests/test-plugins.sh +++ b/tests/test-plugins.sh @@ -7,6 +7,7 @@ repodir="${REPODIR:-"$(git rev-parse --show-toplevel)"}" tempdir="$(mktemp --tmpdir --directory linuxdeploy-misc-plugin-XXXXX)" _cleanup() { + # shellcheck disable=SC2317 [[ -d "$tempdir" ]] && rm -r "$tempdir" } trap _cleanup EXIT From b93a0655a849ed291a151f706ba301e1ed5635cf Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Sun, 14 Dec 2025 20:49:42 +0100 Subject: [PATCH 3/4] Fix shellcheck warnings --- gdb/linuxdeploy-plugin-gdb.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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" < Date: Fri, 19 Dec 2025 21:31:17 +0100 Subject: [PATCH 4/4] Debugging --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4f71405..b5e8c44 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,4 +17,4 @@ jobs: run: shellcheck ./tests/test-plugins.sh - name: Run test script - run: ./tests/test-plugins.sh + run: bash -x ./tests/test-plugins.sh