diff options
| author | Patrick Spek <p.spek@tyil.nl> | 2022-12-06 14:59:15 +0100 |
|---|---|---|
| committer | Patrick Spek <p.spek@tyil.nl> | 2022-12-06 14:59:15 +0100 |
| commit | afb5cbbe4ab09651b100ce5c409a5ecd5c992939 (patch) | |
| tree | 7e6f15908322751064aa6534401921ff7661e51b | |
| parent | 4c9c16944b4dcb292198c02cb0f4df61ebd2f0f9 (diff) | |
Update wrapper script
| -rw-r--r-- | .local/etc/wrapper.d/firefox.rc | 4 | ||||
| -rw-r--r-- | .local/etc/wrapper.d/mpv.rc | 6 | ||||
| -rwxr-xr-x | .local/share/wrapper.sh | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/.local/etc/wrapper.d/firefox.rc b/.local/etc/wrapper.d/firefox.rc index 43e745c..a47d1a4 100644 --- a/.local/etc/wrapper.d/firefox.rc +++ b/.local/etc/wrapper.d/firefox.rc @@ -5,6 +5,8 @@ WRAPPER_BINS=" /usr/bin/librewolf-bin " -WRAPPER_OPTS="--profile \"$HOME/.config/firefox\"" +WRAPPER_OPTS=" + --profile $HOME/.config/firefox +" FIREJAIL_PROFILE="$HOME/.local/etc/firejail/firefox.profile" diff --git a/.local/etc/wrapper.d/mpv.rc b/.local/etc/wrapper.d/mpv.rc index de66126..6dc9579 100644 --- a/.local/etc/wrapper.d/mpv.rc +++ b/.local/etc/wrapper.d/mpv.rc @@ -3,7 +3,8 @@ wrap_before() { if command -v mpc > /dev/null && mpc status | awk 'NR==2 { print }' | grep -iq playing then - wrap_run mpc pause > /dev/null + wrap_log "> mpc pause" + mpc pause > /dev/null WRAPPER_X_MPD_PAUSED="yes" fi } @@ -11,6 +12,7 @@ wrap_before() { wrap_after() { if [ "$WRAPPER_X_MPD_PAUSED" ] then - wrap_run mpc play > /dev/null + wrap_log "> mpc play" + mpc play > /dev/null fi } diff --git a/.local/share/wrapper.sh b/.local/share/wrapper.sh index 336d6e7..3c64620 100755 --- a/.local/share/wrapper.sh +++ b/.local/share/wrapper.sh @@ -68,7 +68,7 @@ main() # Add a firejail wrapper if desired if [ -n "$FIREJAIL_PROFILE" ] then - WRAPPER_CMD="firejail --profile=\"$FIREJAIL_PROFILE\" -- $WRAPPER_CMD" + WRAPPER_CMD="firejail --profile=""$FIREJAIL_PROFILE"" -- $WRAPPER_CMD" fi # Optionally add WRAPPER_OPTS, so theres no double space in @@ -80,7 +80,8 @@ main() # Run all the things we want to run wrap_before - wrap_run "$WRAPPER_CMD" "$@" + wrap_log "> $WRAPPER_CMD $*" + $WRAPPER_CMD "$@" WRAPPER_EXITCODE=$? wrap_after @@ -98,11 +99,6 @@ wrap_log() { printf "[%s] %s\n" "$(date -u +%FT%TZ)" "$*" >&2 } -wrap_run() { - wrap_log "> $*" - eval "$@" -} - wrap_before() { :; } wrap_after() { :; } |