From 344b195149d466c12c2e27f3cf9b686912beb532 Mon Sep 17 00:00:00 2001
From: Patrick Spek
Date: Wed, 22 Jun 2022 11:14:38 +0200
Subject: Update wrapper script
---
.local/share/wrapper.sh | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/.local/share/wrapper.sh b/.local/share/wrapper.sh
index 7d35360..22a9d4d 100755
--- a/.local/share/wrapper.sh
+++ b/.local/share/wrapper.sh
@@ -35,15 +35,23 @@ main()
for bin in $WRAPPER_BINS
do
- [ -x "$bin" ] || continue
+ # Check if this entry is sufficient
+ wrapper_check_executable "$bin" || continue
+ # Add a firejail wrapper if desired
if [ -n "$FIREJAIL_PROFILE" ]
then
- exec firejail --profile="$FIREJAIL_PROFILE" -- \
- "$bin" $WRAPPER_OPTS "$@"
+ bin="firejail --profile=""$FIREJAIL_PROFILE"" -- $bin"
fi
- exec "$bin" $WRAPPER_OPTS "$@"
+ # Run all the things we want to run
+ wrap_before
+ printf "> %s\n" "$bin $WRAPPER_OPTS $@" >&2
+ $bin $WRAPPER_OPTS "$@"
+ exit=$?
+ wrap_after
+
+ return $exit
done
printf "No underlying executable found for %s:\n" "$wrapped" >&2
@@ -53,4 +61,14 @@ main()
done
}
+wrapper_check_executable() {
+ command -v "$1" > /dev/null && return 0
+ [ -x "$1" ] && return 0
+
+ return 1
+}
+
+wrap_before() { :; }
+wrap_after() { :; }
+
main "$@"
--
cgit v1.1