Changeset 137 for trunk/tssh

Timestamp:

Dec 28, 2017, 4:02:28 PM (7 years ago)

Author:

g7moreau

Message:

• Define local variable and better mode implementation

File:

• trunk/tssh/tssh (modified) (4 diffs)

trunk/tssh/tssh

@@ -112 +112 @@
 get_host_list () {
    local cluster
+   local default_mode=''
+
+   # set local mode
+   if echo $1 | grep -- ^--mode=
+   then
+      default_mode=$(echo $1 | grep -- ^--mode= | cut -f 2 -d '=')
+      shift
+   fi
+
    for host in $*
    do
-      mode=""
-      last_char="${host: -1}"
+      local mode=${default_mode}
+      local -r last_char="${host: -1}"
       if [ "${last_char}" == "-" -o "${last_char}" == "+" ]
       then
@@ -123 +132 @@
 
       # short host without login part if any
-      justhost=${host#*@}
+      local -r justhost=${host#*@}
       
       cluster=$(grep "^${justhost}\b" ${HOME}/.csshrc | cut -f 2 -d '=')
@@ -155 +164 @@
          # cluster, jump in a recursive mode
          [ "${verbose}" == 'yes' ] && echo Warning: recursive mode for cluster ${cluster} with mode ${mode}
-         cluster=$(get_host_list "${cluster}${mode}")
+         cluster=$(get_host_list --mode=${mode} "${cluster}")
       fi
    done
@@ -187 +196 @@
    fi
 
-   session=$(shuf -n 1 /usr/share/dict/words | tr -cd "[:alpha:]")
+   local -r session=$(shuf -n 1 /usr/share/dict/words | tr -cd "[:alpha:]")
 
    IFS=$'\n' host=($(cat "/tmp/${base_path}/${f}"))