improvements

1 files changed, 30 insertions, 9 deletions

diff --git a/ssh-check b/ssh-check
index b6bfbd3..c2f18d7 100755
--- a/ssh-check
+++ b/ssh-check
@@ -1,10 +1,13 @@
 #!/bin/bash
 
 CFG_FILE=$HOME/.config/ssh-check.list
-CFG_FILE_MAX=$((2**31-1))
+TIMEOUT=5 # seconds
 
-read SSH_OPTIONS <<END
--o ConnectTimeout=3
+
+read_all='read -N2147483647'
+
+$read_all SSH_OPTIONS <<END
+-o ConnectTimeout=$TIMEOUT
 -o ControlPath=none
 -o PasswordAuthentication=no
 -o StrictHostKeyChecking=yes
@@ -18,19 +21,27 @@ quietly()
 c ()
 {
     local h hosts
-    read -r -N "$CFG_FILE_MAX" hosts < "$CFG_FILE"
+    $read_all -r hosts < "$CFG_FILE"
     if [ $# = 0 ]; then
         set -- -4
     fi
+    host_field_width=1
+    for h in $hosts
+    do
+        if [ ${#h} -gt $host_field_width ]
+        then
+            host_field_width=${#h}
+        fi
+    done
     while true; do
         {
             for h in $hosts
             do
-                ( if p=$(quietly ssh $SSH_OPTIONS -n "$h" -- true)
+                ( if uptime=$(ssh $SSH_OPTIONS -n "$h" -- uptime 2>/dev/null)
                 then
-                    echo "Succeeded: $h"
+                    printf "%-15s %-${host_field_width}s  %s\n" "Succeeded:" "$h" "${uptime# }"
                 else
-                    echo "Failed:    $h"
+                    printf "%-15s %-${host_field_width}s\n"    "Failed:"    "$h"
                 fi ) &
             done
             wait
@@ -56,17 +67,27 @@ edit_config()
     rm "$f".timestamp
 }
 
+unset run_anyway do_edit
 while [ $# -gt 0 ]
 do
     case "$1" in
-        --edit) edit_config; exit ;;
+        --edit) do_edit=y;;
+        --run) run_anyway=y;;
         --) shift; break;;
         *) exit 1 ;;
     esac
     shift
 done
 
-if [ -t 0 ] && ! [ -e "$CFG_FILE" ]
+if [ "$do_edit" ]
+then
+    edit_config
+    r=$?
+    if ! [ "$run_anyway}" ]
+    then
+        exit $r
+    fi
+elif [ ! -e "$CFG_FILE" -a -t 0 ]
 then
     edit_config
 fi