various script cleanups

15 files changed, 45 insertions, 16 deletions

diff --git a/bin/hush/kill_focused b/bin/hush/kill-focused
index 37271ac..37271ac 100755
--- a/bin/hush/kill_focused
+++ b/bin/hush/kill-focused
diff --git a/bin/hush/numkeys b/bin/hush/numkeys
index ab9dc14..9d037f5 100755
--- a/bin/hush/numkeys
+++ b/bin/hush/numkeys
@@ -1,4 +1,6 @@
 #!/bin/sh
+set -eu
+set -o pipefail
 
 on() {
     xmodmap -e 'keycode 10 = exclam 1'
diff --git a/bin/hush/setup-inputs b/bin/hush/setup-inputs
index 6aaa19f..94e8e7f 100755
--- a/bin/hush/setup-inputs
+++ b/bin/hush/setup-inputs
@@ -1,9 +1,11 @@
 #!/bin/sh
+set -eu
+set -o pipefail
 
 # key bindings
 setxkbmap -option ctrl:nocaps
 setxkbmap -option compose:caps
-xmodmap $HOME/.Xmodmap
+xmodmap "$HOME"/.Xmodmap
 "$(dirname "$0")"/numkeys on
 
 # trackpad settings
diff --git a/bin/hush/svdn b/bin/hush/svdn
index ce6f4c4..9e0fa0b 100755
--- a/bin/hush/svdn
+++ b/bin/hush/svdn
@@ -1,13 +1,15 @@
-#!/bin/bash
+#!/bin/sh
+set -eu
+set -o pipefail
 
 svst "$1" && svstop "$1"
 svst "$1" && sleep 1
 svst "$1" && svstop "$1"
-for i in 1..5; do
+for _ in $(seq 1 5); do
     svst "$1" && sleep 1
 done
 svst "$1" && svstop "$1"
-for i in 1..10; do
+for _ in $(seq 1 10); do
     svst "$1" && sleep 1
 done
 svst "$1" && svkill "$1"
diff --git a/bin/hush/svget b/bin/hush/svget
index 77c18f4..0eab9bf 100755
--- a/bin/hush/svget
+++ b/bin/hush/svget
@@ -1,3 +1,5 @@
-#!/bin/bash
+#!/bin/sh
+set -eu
+set -o pipefail
 
 svstat "$HOME/.services/enabled/$1"
diff --git a/bin/hush/svkill b/bin/hush/svkill
index 060d2c7..a84e1a2 100755
--- a/bin/hush/svkill
+++ b/bin/hush/svkill
@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/bin/sh
+set -eu
+set -o pipefail
 
 svc -k "$HOME/.services/enabled/$1"
 svget "$1"
diff --git a/bin/hush/svlog b/bin/hush/svlog
index 436b25a..201ce9b 100755
--- a/bin/hush/svlog
+++ b/bin/hush/svlog
@@ -1,3 +1,5 @@
-#!/bin/bash
+#!/bin/sh
+set -eu
+set -o pipefail
 
 tail -F "$HOME/.log/$1/current" | tai64nlocal
diff --git a/bin/hush/svnuke b/bin/hush/svnuke
index 6a383ce..309a1d5 100755
--- a/bin/hush/svnuke
+++ b/bin/hush/svnuke
@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/bin/sh
+set -eu
+set -o pipefail
 
 svdn "$1"
 svdn "$1/log"
diff --git a/bin/hush/svre b/bin/hush/svre
index e57576e..159b017 100755
--- a/bin/hush/svre
+++ b/bin/hush/svre
@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/bin/sh
+set -eu
+set -o pipefail
 
 svdn "$1"
 svup "$1"
diff --git a/bin/hush/svst b/bin/hush/svst
index 92d20c1..4d0c6ce 100755
--- a/bin/hush/svst
+++ b/bin/hush/svst
@@ -1,3 +1,5 @@
-#!/bin/bash
+#!/bin/sh
+set -eu
+set -o pipefail
 
 svget "$1" | grep -q ": up ("
diff --git a/bin/hush/svstop b/bin/hush/svstop
index 36c0132..649ec26 100755
--- a/bin/hush/svstop
+++ b/bin/hush/svstop
@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/bin/sh
+set -eu
+set -o pipefail
 
 svc -d "$HOME/.services/enabled/$1"
 svget "$1"
diff --git a/bin/hush/svup b/bin/hush/svup
index c49a99e..3772fdb 100755
--- a/bin/hush/svup
+++ b/bin/hush/svup
@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/bin/sh
+set -eu
+set -o pipefail
 
 svc -u "$HOME/.services/enabled/$1"
 svget "$1"
diff --git a/bin/hush/update-mail b/bin/hush/update-mail
index b909d9f..8149a8d 100755
--- a/bin/hush/update-mail
+++ b/bin/hush/update-mail
@@ -1,9 +1,11 @@
 #!/bin/sh
+set -eu
+set -o pipefail
 
 stat=$(svstat "$HOME/.services/enabled/offlineimap")
-if echo $stat | grep -q "offlineimap: down"; then
+if echo "$stat" | grep -q "offlineimap: down"; then
     echo "no offlineimap process running" >&2
     exit 1
 fi
-pid=$(echo $stat | sed 's/.*offlineimap: up (pid \([[:digit:]]\+\)).*/\1/')
-kill -USR1 $pid
+pid=$(echo "$stat" | sed 's/.*offlineimap: up (pid \([[:digit:]]\+\)).*/\1/')
+kill -USR1 "$pid"
diff --git a/bin/hush/volume b/bin/hush/volume
index e4c81fb..a0df2d3 100755
--- a/bin/hush/volume
+++ b/bin/hush/volume
@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/bin/sh
+set -eu
+set -o pipefail
 
 case $1 in
     up)
diff --git a/bin/hush/webcam b/bin/hush/webcam
index 48ee3f3..fdac5f8 100755
--- a/bin/hush/webcam
+++ b/bin/hush/webcam
@@ -1,2 +1,5 @@
 #!/bin/sh
+set -eu
+set -o pipefail
+
 mpv av://v4l2:/dev/video0