bunch of new stuff, a few fixes

[distro-setup] / ziva-screen

diff --git a/ziva-screen b/ziva-screen
index e951311286cd50c50769b7c3e25dfc6f0c9a9d20..7ce32c2c68e65e1a7bd0380e0585128766906bc7 100755 (executable)
--- a/ziva-screen
+++ b/ziva-screen
@@ -5,17 +5,26 @@
 source /usr/local/lib/err
 [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 
+dest_dir=/d/ziva-log
+case $HOSTNAME in
+  sy)
+    dest_dir=/t/zlog
+    ;;
+esac
+
 f=/run/user/1000/ziva-tmp.jpg
 
-cd /d/ziva-log
+mkdir -p $dest_dir
+cd $dest_dir
 shopt -s nullglob
 jpgs=( 20*jpg )
 if (( ${#jpgs[@]} >= 1 )); then
+  # shellcheck disable=SC2048 # intentional
   lastf=$(ls -1 20*jpg  | tail -n1)
 fi
 
 ssh bow DISPLAY=:0 scrot -z $f 2>/dev/null || exit 0
-rsync --inplace bow:$f /d/ziva-log 2>/dev/null || exit 0
+rsync --inplace bow:$f $dest_dir 2>/dev/null || exit 0
 ssh bow rm -f $f
 
 same=false
@@ -23,7 +32,7 @@ if [[ $lastf ]]; then
   # returns 2 on error, but maybe in that case we want to ignore, file the image away
   # and then it can go away in a subsequent comparison. going with that for now.
   diff=$(compare -metric MSE $lastf ziva-tmp.jpg /dev/null |& sed 's/[^0-9].*//') ||:
-  if printf "%s\n" "$diff" | egrep '^[0-9]+$' &>/dev/null && (( diff < 200 )); then
+  if printf "%s\n" "$diff" | grep -E '^[0-9]+$' &>/dev/null && (( diff < 200 )); then
     same=true
   fi
 fi
@@ -31,5 +40,5 @@ fi
 if $same; then
   rm -f ziva-tmp.jpg
 else
-  mv ziva-tmp.jpg $(date +%F.%R).jpg
+  mv ziva-tmp.jpg "$(date +%F.%R)".jpg
 fi