scripts/riot

@@ -91,25 +91,24 @@ get_server_meta() {
     esac
 }
 
+# remote setting, including jump servers
+# will be called only once
+# provides:
+SERVER=""
+TRUST_SERVER=1
+PORT=""  # optional
+USERNAME=""  # optional
+SSH_OPTIONS=""  # optional
+if [[ "$RIOT_TRUST_CLIENT" == "1" ]]; then
+    SSH_OPTIONS='-o ControlMaster=auto -o ControlPath=/tmp/sshcm-%C -o PermitLocalCommand=yes'
+fi
 parse_remote() {
-    # remote setting, including jump servers
-    # called for every remote
-    # provides:
-    SERVER=""
-    TRUST_SERVER=1
-    PORT=""  # optional
-    USERNAME=""  # optional
-    SSH_OPTIONS=""  # optional
-    if [[ "$RIOT_TRUST_CLIENT" == "1" ]]; then
-        SSH_OPTIONS='-o ControlMaster=auto -o ControlPath=/tmp/sshcm-%C -o PermitLocalCommand=yes'
-    fi
-    # handle input
     local remote="$1"
     local jump_servers=""
     # loop for jump servers
     while [[ -n $remote ]]; do
-        local server=${remote%%/*}
+        local server=${remote%%,*}
-        remote=${remote#*/}
+        remote=${remote#*,}
         get_server_meta "$server"
         if [[ -n "$RET_JUMP_SERVER" ]]; then
             jump_servers="$jump_servers${jump_servers:+,}$RET_JUMP_SERVER"
@@ -213,38 +212,35 @@ router() {
         print_help
         exit
     fi
-
+    parse_remote "$1"
-    IFS=',' read -ra remotes <<< "$1"
+    case $2 in
-    for remote in "${remotes[@]}"; do
+        -h|--help)
-        if [[ -z "$remote" ]]; then
+            print_help
-            continue
+            exit
-        fi
+            ;;
-        parse_remote "$remote"
+        ssh|"" )
-        case $2 in
+            run_ssh ssh "${@:3}"
-            ssh|"" )
+            ;;
-                run_ssh ssh "${@:3}"
+        zssh )
-                ;;
+            run_ssh zssh
-            zssh )
+            ;;
-                run_ssh zssh
+        sftp )
-                ;;
+            run_ssh sftp
-            sftp )
+            ;;
-                run_ssh sftp
+        sshl )
-                ;;
+            test -n "$3" || fmt_fatal "no target address provided"
-            sshl )
+            run_sshl "$3"
-                test -n "$3" || fmt_fatal "no target address provided"
+            ;;
-                run_sshl "$3"
+        scp )
-                ;;
+            test -n "$3" || fmt_fatal "no source path specified"
-            scp )
+            test -n "$4" || fmt_fatal "no destination path specified"
-                test -n "$3" || fmt_fatal "no source path specified"
+            run_scp "$3" "$4"
-                test -n "$4" || fmt_fatal "no destination path specified"
+            ;;
-                run_scp "$3" "$4"
+        * )
-                ;;
+            print_help
-            * )
+            fmt_fatal "unknown command: $2"
-                print_help
+            ;;
-                fmt_fatal "unknown command: $2"
+    esac
-                ;;
-        esac
-    done
 }
 
 router "${GOT_OPTS[@]}"