fixup

test/common.sh

@@ -113,7 +113,7 @@ nvm_json_awk_egrep() {
   local pattern_string
   pattern_string=$1
 
-  gawk '{
+  awk '{
     while ($0) {
       start=match($0, pattern);
       token=substr($0, start, RLENGTH);
@@ -128,15 +128,13 @@ nvm_json_tokenize() {
   local ESCAPE
   local CHAR
 
-  if echo 'test string' | grep -Eao --color=never 'test' &>/dev/null
-  then
+  if echo 'test string' | grep -Eao --color=never 'test' > /dev/null 2>&1; then
     GREP='grep -Eao --color=never'
   else
     GREP='grep -Eao'
   fi
 
-  if echo "test string" | grep -Eo "test" &>/dev/null
-  then
+  if echo "test string" | grep -Eo "test" > /dev/null 2>&1; then
     ESCAPE='(\\[^u[:cntrl:]]|\\u[0-9a-fA-F]{4})'
     CHAR='[^[:cntrl:]"\\]'
   else
@@ -158,19 +156,16 @@ nvm_json_tokenize() {
 }
 
 _json_parse_array() {
-  local index
-  index=0
-  local ary
-  ary=''
+  local index=0
+  local ary=''
   read -r token
   case "$token" in
     ']') ;;
     *)
-      while :
-      do
+      while :; do
         _json_parse_value "${1}" "${index}"
         index=$((index+1))
-        ary="${ary}""${value}"
+        ary="${ary}${value}"
         read -r token
         case "${token}" in
           ']') break ;;
@@ -186,14 +181,12 @@ _json_parse_array() {
 
 _json_parse_object() {
   local key
-  local obj
-  obj=''
+  local obj=''
   read -r token
   case "$token" in
     '}') ;;
     *)
-      while :
-      do
+      while :; do
         case "${token}" in
           '"'*'"') key="${token}" ;;
           *) nvm_json_throw "EXPECTED string GOT ${token:-EOF}" ;;
@@ -220,14 +213,10 @@ _json_parse_object() {
 }
 
 _json_parse_value() {
-  local jpath
-  jpath="${1:+$1,}$2"
-  local isleaf
-  isleaf=0
-  local isempty
-  isempty=0
-  local print
-  print=0
+  local jpath="${1:+$1,}$2"
+  local isleaf=0
+  local isempty=0
+  local print=0
 
   case "$token" in
     '{') _json_parse_object "${jpath}" ;;
@@ -257,9 +246,6 @@ _json_parse() {
   esac
 }
 
-
 nvm_json_extract() {
-  local parsed
-  parsed=$(nvm_json_tokenize | _json_parse)
-  echo "${parsed}" | grep -e "${1}" | awk '{print $2 $3}'
+  nvm_json_tokenize | _json_parse | grep -e "${1}" | awk '{print $2 $3}'
 }