diff options
| author | 2024-11-15 02:02:06 +0000 | |
|---|---|---|
| committer | 2024-11-15 02:02:06 +0000 | |
| commit | 549e328b61c44bc6fe244f14a4eeaf1bfa464a9b (patch) | |
| tree | 5c18515d7d492bc06ed2dc2c4661a349ab73f392 | |
| parent | 075e8ac472403934f4ca383beae2cd9ac555f71a (diff) | |
Shell vagaries and chatter reduction:
* Reduce talk from dash about set -m that's cluttering up my logs: not sure
that it was ever necessary anyway.
* Don't run swob in an unnecessary subshell.
* Gag wob's own verbose babble, which I forgot about from debugging.
* Prevent `set -u' from biting me about $!
| -rwxr-xr-x | swob.sh | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2023-2024 The Remph <lhr@disroot.org> # SPDX-License-Identifier: GPL-3.0-or-later -set ${BASH_VERSION:+-o pipefail} -efmu +set ${BASH_VERSION:+-o pipefail} -efu wobfifo=$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY.swob wobini= @@ -44,11 +44,11 @@ start_wob() { set_wobini # spawn wob process with temporary file(s) - ( + { trap 'rm "$wobfifo"' 0 # Don't `exec' wob here, else the trap won't work - wob -c "$wobini" -v <$wobfifo - ) & + wob -c "$wobini" <$wobfifo + } & } do_cmd_get_percent() { @@ -104,4 +104,4 @@ start_wob # soon as it's done sleeping (the existing situation is that as long as one # script sleeps, the shell that spawned the wob process will wait until that # sleep is done) -test -z $! || wait $! +test -z ${!-} || wait $! # surprisingly, $! could be unset (not just zero-length) |
