scripts/riot

@@ -91,25 +91,24 @@ get_server_meta() {
     esac
 }
 
-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
+# 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
-    # handle input
+fi
+parse_remote() {
     local remote="$1"
     local jump_servers=""
     # loop for jump servers
     while [[ -n $remote ]]; do
-        local server=${remote%%/*}
-        remote=${remote#*/}
+        local server=${remote%%,*}
+        remote=${remote#*,}
         get_server_meta "$server"
         if [[ -n "$RET_JUMP_SERVER" ]]; then
             jump_servers="$jump_servers${jump_servers:+,}$RET_JUMP_SERVER"
@@ -213,14 +212,12 @@ router() {
         print_help
         exit
     fi
-
-    IFS=',' read -ra remotes <<< "$1"
-    for remote in "${remotes[@]}"; do
-        if [[ -z "$remote" ]]; then
-            continue
-        fi
-        parse_remote "$remote"
+    parse_remote "$1"
     case $2 in
+        -h|--help)
+            print_help
+            exit
+            ;;
         ssh|"" )
             run_ssh ssh "${@:3}"
             ;;
@@ -244,7 +241,6 @@ router() {
             fmt_fatal "unknown command: $2"
             ;;
     esac
-    done
 }
 
 router "${GOT_OPTS[@]}"