Script fixes

bin/linux/backup.sh

@@ -8,13 +8,18 @@ if [ "$(uname)" != "Linux" ]; then
   exit 1
 fi
 
-DEFAULT=`echo /media/${USER}/[bB]ackup/${USER}/`
+shopt -s nullglob
+matches=( /media/"${USER}"/[bB]ackup/"${USER}"/ )
+shopt -u nullglob
+if [ ${#matches[@]} -gt 0 ]; then
+  DEFAULT="${matches[0]}"
+else
+  DEFAULT="/media/${USER}/Backup/${USER}/"
+fi
 DEST="${1:-${DEFAULT}}"
 
 function verify_dest {
-  arr=($1)
-  items=${#arr[@]}
-  if [ $items -ne 1 ] ; then
+  if [ -z "$1" ] ; then
     echo "Bad count of backup destinations." > /dev/stderr
     exit 1
   fi
@@ -25,7 +30,7 @@ function verify_dest {
     echo -n "Destination $dir does not end in a /, " > /dev/stderr
     echo "this is probably not what you want!" > /dev/stderr
     echo "Press a key to continue, or CTRL-C to cancel." > /dev/stderr
-    read
+    read -r
   fi
 }
 

bin/linux/i3lock.sh

@@ -1,6 +1,10 @@
 #!/bin/sh
 LOCKTIME="${SCREENSAVER_MIN:-5}"
 LOCKER="i3lock -c 000000"
+# Cleanup previously leaked background agents
+pkill -x xss-lock 2>/dev/null || true
+pkill -x xautolock 2>/dev/null || true
+
 # intentionally want word splitting below
 # do not quote this
 /usr/bin/xss-lock -- ${LOCKER} &

bin/linux/switch_virt.sh

@@ -1,11 +1,13 @@
 #!/bin/bash
 
+set -e
+
 if [ $# -lt 1 ] ; then
   echo "Usage: $0 <kvm|vbox>" >&2
   exit 1
 fi
 
-if [ `whoami` != "root" ] ; then
+if [ "$(id -u)" -ne 0 ] ; then
   if which sudo >/dev/null 2>&1 ; then
     sudo "$0" "$@"
     exit