Merge remote-tracking branch 'walkeran/batchmode'

Author: rtomayko

bin/ghe-host-check

@@ -24,7 +24,7 @@ port=$(ssh_port_part "$host")
 hostname=$(ssh_host_part "$host")
 
 set +e
-output=$(echo "cat \"$GHE_REMOTE_METADATA_FILE\" 2>/dev/null || exit 101" | ghe-ssh $options $host -- /bin/sh 2>&1)
+output=$(echo "cat \"$GHE_REMOTE_METADATA_FILE\" 2>/dev/null || exit 101" | ghe-ssh -o 'BatchMode no' $options $host -- /bin/sh 2>&1)
 rc=$?
 set -e
 

share/github-backup-utils/ghe-ssh

@@ -10,11 +10,11 @@ set -e
 cd $(dirname "$0")/../..
 . share/github-backup-utils/ghe-backup-config
 
-opts=$GHE_EXTRA_SSH_OPTS
+eval opts=($GHE_EXTRA_SSH_OPTS)
 while true; do
     case "$1" in
         -p|-l|-o)
-            opts="$opts $1 $2"
+            opts=("${opts[@]}" $1 "$2")
             shift 2
             ;;
         --)
@@ -42,12 +42,12 @@ port=$(ssh_port_part "$host")
 host=$(ssh_host_part "$host")
 
 # Add port / -p option when non-standard port given.
-[ "$port" != "22" ] && opts="-p $port $opts"
+[ "$port" != "22" ] && opts=(-p $port "${opts[@]}")
 
 # Add user / -l option
 user="${host%@*}"
 [ "$user" = "$host" ] && user="admin"
-opts="-l $user $opts"
+opts=(-l "$user" "${opts[@]}")
 
 # Bail out with error if the simple command form is used with complex commands.
 # Complex
@@ -61,4 +61,4 @@ fi
 $GHE_VERBOSE_SSH && set -x
 
 # Exec ssh command with modified host / port args and add nice to command.
-exec ssh $opts "$host" -- $GHE_NICE $GHE_IONICE "$@"
+exec ssh "${opts[@]}" -o 'BatchMode yes' "$host" -- $GHE_NICE $GHE_IONICE "$@"