style: fix some lint issues

Author: Jasonej

bin/_helpers

@@ -27,24 +27,24 @@ if test -t 1; then
         COLOR_C=6   # color code - CYAN
         COLOR_N=246 # color code - NEUTRAL (GRAY)
 
-        BG_R="$(tput setab $COLOR_R)" # Background - RED
-        BG_G="$(tput setab $COLOR_G)" # Background - GREEN
-        BG_Y="$(tput setab $COLOR_Y)" # Background - YELLOW
-        BG_B="$(tput setab $COLOR_B)" # Background - BLUE
-        #BG_M="$(tput setab $COLOR_M)" # Background - MAGENTA
-        #BG_C="$(tput setab $COLOR_C)" # Background - CYAN
-        BG_N="$(tput setab $COLOR_N)" # Background - NEUTRAL (GRAY)
+        export BG_R="$(tput setab $COLOR_R)" # Background - RED
+        export BG_G="$(tput setab $COLOR_G)" # Background - GREEN
+        export BG_Y="$(tput setab $COLOR_Y)" # Background - YELLOW
+        export BG_B="$(tput setab $COLOR_B)" # Background - BLUE
+        export BG_M="$(tput setab $COLOR_M)" # Background - MAGENTA
+        export BG_C="$(tput setab $COLOR_C)" # Background - CYAN
+        export BG_N="$(tput setab $COLOR_N)" # Background - NEUTRAL (GRAY)
 
-        #FG_R="$(tput setaf $COLOR_R)" # Foreground - RED
-        #FG_G="$(tput setaf $COLOR_G)" # Foreground - GREEN
-        #FG_Y="$(tput setaf $COLOR_Y)" # Foreground - YELLOW
-        #FG_B="$(tput setaf $COLOR_B)" # Foreground - BLUE
-        FG_M="$(tput setaf $COLOR_M)" # Foreground - MAGENTA
-        FG_C="$(tput setaf $COLOR_C)" # Foreground - CYAN
-        FG_N="$(tput setaf $COLOR_N)" # Foreground - NEUTRAL (GRAY)
+        export FG_R="$(tput setaf $COLOR_R)" # Foreground - RED
+        export FG_G="$(tput setaf $COLOR_G)" # Foreground - GREEN
+        export FG_Y="$(tput setaf $COLOR_Y)" # Foreground - YELLOW
+        export FG_B="$(tput setaf $COLOR_B)" # Foreground - BLUE
+        export FG_M="$(tput setaf $COLOR_M)" # Foreground - MAGENTA
+        export FG_C="$(tput setaf $COLOR_C)" # Foreground - CYAN
+        export FG_N="$(tput setaf $COLOR_N)" # Foreground - NEUTRAL (GRAY)
 
-        BOLD="$(tput bold)"
-        RESET="$(tput sgr0)"
+        export BOLD="$(tput bold)"
+        export RESET="$(tput sgr0)"
     fi
 fi
 

bin/proxy

@@ -51,8 +51,8 @@ function parse_arg() {
     local key=$1
     local value=$2
 
-    if [ "$2" ]; then
-        echo "$2"
+    if [ "$value" ]; then
+        echo "$value"
     else
         output_error "'${key}' requires a non-empty argument."
         exit 1
@@ -136,15 +136,17 @@ function pick_one_virtual_host_from_file() {
     local FILE=$1
     local EXCEPT=$2
 
-    local HOST_STRING=$(sed -nr 's/.*VIRTUAL_HOST=(.*)/\1/p' $FILE)
+    local HOST_STRING
     local HOSTS
     local HOST
 
+    HOST_STRING=$(sed -nr 's/.*VIRTUAL_HOST=(.*)/\1/p' $FILE)
+
     IFS="," read -ra HOSTS <<< "$HOST_STRING"
 
     for HOST_ENTRY in "${HOSTS[@]}"; do
       if [ "$HOST_ENTRY" != "$EXCEPT" ]; then
-          echo $HOST_ENTRY
+          HOST=$HOST_ENTRY
           break;
       fi
     done
@@ -153,6 +155,8 @@ function pick_one_virtual_host_from_file() {
         output_error "No VIRTUAL_HOST found in $FILE."
         exit 1
     fi
+
+    echo $HOST
 }
 
 function determine_virtual_host() {
@@ -161,7 +165,8 @@ function determine_virtual_host() {
         exit 1
     fi
 
-    local HOST=$(pick_one_virtual_host_from_file $DOCKER_FILE)
+    local HOST
+    HOST=$(pick_one_virtual_host_from_file $DOCKER_FILE)
 
     if [ $? -ne 0 ]; then
         echo $HOST
@@ -182,7 +187,8 @@ function determine_virtual_host_override() {
         exit 1
     fi
 
-    local HOST=$(pick_one_virtual_host_from_file $DOCKER_FILE_OVERRIDE $1)
+    local HOST
+    HOST=$(pick_one_virtual_host_from_file $DOCKER_FILE_OVERRIDE $1)
 
     if [ $? -ne 0 ]; then
         echo $HOST
@@ -224,4 +230,4 @@ output_info "Starting proxy... $FG_C${LOCAL_DOMAIN}$FG_N:$FG_M${LOCAL_PORT}$RESE
 echo
 output_tagged_string "$BG_N" "Proxy URL" "https://$PROXY_DOMAIN"
 echo
-ssh -tR ${PROXY_PORT}:${LOCAL_DOMAIN}:${LOCAL_PORT} [email protected] sirtunnel.py ${PROXY_DOMAIN} ${PROXY_PORT}
+ssh -tR "${PROXY_PORT}:${LOCAL_DOMAIN}:${LOCAL_PORT}" [email protected] sirtunnel.py "${PROXY_DOMAIN}" "${PROXY_PORT}"