improvements?

1 files changed, 24 insertions, 16 deletions

diff --git a/ssh-check b/ssh-check
index 5045bb1..6d23b59 100755
--- a/ssh-check
+++ b/ssh-check
@@ -3,10 +3,7 @@
 CFG_FILE=$HOME/.config/ssh-check.list
 TIMEOUT=5 # seconds
 
-
-read_all='read -N2147483647'
-
-$read_all SSH_OPTIONS <<END
+read -d '' SSH_OPTIONS <<END
 -o ConnectTimeout=$TIMEOUT
 -o ControlPath=none
 -o PasswordAuthentication=no
@@ -33,28 +30,39 @@ match()
 
 main()
 {
-    local h hosts
-    $read_all -r hosts < "$CFG_FILE"
-    host_field_width=1
-    for h in $hosts
+    local h
+    declare -a hosts=()
+    mapfile hosts < "$CFG_FILE"
+    MIN_HOST_FIELD_WIDTH=10
+    host_field_width=$MIN_HOST_FIELD_WIDTH
+    for h in ${hosts[@]}
     do
         if [ ${#h} -gt $host_field_width ]
         then
             host_field_width=${#h}
         fi
     done
-    while true; do
+    while true
+    do
         {
-            for h in $hosts
+            for h in ${hosts[@]}
             do
                 [ $# = 0 ] || match "$h" "$@" || continue
 
-                ( if uptime=$(ssh $SSH_OPTIONS -n "$h" -- ${REMOTE_COMMAND:-uptime} 2>/dev/null)
-                then
-                    printf "%-15s %-${host_field_width}s  %s\n" "Succeeded:" "$h" "${uptime# }"
-                else
-                    printf "%-15s %-${host_field_width}s\n"    "Failed:"    "$h"
-                fi ) &
+                (
+                    #.........."1234567890123456"
+                    successpat=" Success:       %-${host_field_width}s  %s\n"
+                    failurepat="*FAILURE:       %-${host_field_width}s\n"
+                    if command_stdout=$(ssh -n $SSH_OPTIONS \
+                            "$h" -- \
+                            ${REMOTE_COMMAND:-uptime} \
+                            2>/dev/null)
+                    then
+                        printf "$successpat" "$h" "${command_stdout# }"
+                    else
+                        printf "$failurepat" "$h"
+                    fi
+                ) &
             done
             wait
         } | column -t -s'$'