Linting: shfmt (3)

Author: gsmith-sas

logging/bin/onboard.sh

@@ -40,6 +40,7 @@ createuser=false
 POS_PARMS=""
 
 while (("$#")); do
+    # shellcheck disable=SC2221,SC2222
     case "$1" in
     -ns | --namespace)
         if [ -n "$2" ] && [ "${2:0:1}" != "-" ]; then
@@ -218,7 +219,9 @@ if [ "$createuser" == "true" ]; then
         log_warn "You can create a new user with the appropriate access controls by calling the logging/bin/user.sh script directly."
     else
         if [ -z "$tenant" ]; then
+            set -x
             ./logging/bin/user.sh CREATE -ns "$namespace" -u "$inituser" "$passwdarg"
+            set +x
         else
             ./logging/bin/user.sh CREATE -ns "$namespace" -t "$tenant" -u "$inituser" "$passwdarg"
         fi

logging/bin/remove_eventrouter.sh

@@ -17,7 +17,7 @@ cp -R logging/eventrouter/eventrouter.yaml "$logDir"/eventrouter.yaml
 
 # Replace placeholders
 log_debug "Replacing logging namespace for files in [$logDir]"
-v4m_replace  "__LOG_NS__" "$LOG_NS" "$logDir"/eventrouter.yaml
+v4m_replace "__LOG_NS__" "$LOG_NS" "$logDir"/eventrouter.yaml
 
 log_info "Removing Event Router [$(date)]"
 # Remove existing instance of Event Router in the kube-system namespace (if present).

logging/bin/user.sh

@@ -51,6 +51,7 @@ set -e
 POS_PARMS=""
 
 while (("$#")); do
+    # shellcheck disable=SC2221,SC2222
     case "$1" in
     -ns | --namespace)
         if [ -n "$2" ] && [ "${2:0:1}" != "-" ]; then
@@ -120,7 +121,7 @@ if [ "$#" -lt 1 ]; then
     show_usage
     exit 1
 else
-    action=$(echo "$1" | tr '[a-z]' '[A-Z]')
+    action=$(echo "$1" | tr 'a-z' 'A-Z')
     shift
 
     if [ "$action" != "CREATE" ] && [ "$action" != "DELETE" ]; then