Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions gdb/linuxdeploy-plugin-gdb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
Expand Down Expand Up @@ -55,15 +57,15 @@ 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 "$@"
# AppRun.wrapped (this script) is a wrapper on AppRun.wrapped.orig
# 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" <<EOF
#! /bin/bash

Expand All @@ -73,4 +75,4 @@ else
exec "\$APPDIR/${new_exe#"$appdir"}" "\$@"
fi
EOF
chmod $verbose 755 "$old_exe"
chmod "${verbose[@]}" 755 "$old_exe"
1 change: 1 addition & 0 deletions tests/test-plugins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading