temp debugging commit

Author: edwmurph

nvm.sh

@@ -351,44 +351,43 @@ nvm_normalize_semver() {
 
     # convert comparators into required grammar
     local validated_comparator_set
-    validated_comparator_set=$(command printf " %s " "$comparator_set" \
-      | command sed -E "
-      # exactly 1 space is needed before and after every comparator (including the first and last comparators)
-      s/\011/ /g;s/ +/ /g;
-
-      # normalize all wildcards to x
-      s/X|\*/x/g;
-
-      # space out numbers surrounding '-'
-      s/ ?- ?/ - /g;
-
-      # ' 1 ' => ' 1.x.x '
-      # ' x ' => ' x.x.x '
-      s/ ([0-9]+|x) / \1.x.x /g;
-
-      # ' 1.2 ' => ' 1.2.x '
-      # ' 1.x ' => ' 1.x.x '
-      # ' x.x ' => ' x.x.x '
-      s/ (([0-9]+|x)\.([0-9]+|x)) / \1.x /g;
-
-      # ' 1.2.3 - 1.2.4 ' => ' >=1.2.3 <=1.2.4 '
-      s/ (([0-9]+|x)\.([0-9]+|x)\.([0-9]+|x)) ?\- ?(([0-9]+|x)\.([0-9]+|x)\.([0-9]+|x)) / >=\1 <=\5 /g;
-
-      # ' > 1.2.3 ' => ' >1.2.3 '
-      # ' < 1.2.5 ' => ' <1.2.5 '
-      # ' <= 1.2.3 ' => ' <=1.2.3 '
-      # ' >= 1.2.3 ' => ' >=1.2.3 '
-      # ' = 1.2.3 ' => ' =1.2.3 '
-      # ' ~ 1.2.3 ' => ' ~1.2.3 '
-      # ' ^ 1.2.3 ' => ' ^1.2.3 '
-      # ' v 1.2.3 ' => ' v1.2.3 '
-      s/ (v|<|>|<=|>=|=|~|\^) (([0-9]+|x)\.([0-9]+|x)\.([0-9]+|x)) / \1\2 /g;
-
-      # ' =1.2.3 ' => ' 1.2.3 '
-      # ' v1.2.3 ' => ' 1.2.3 '
-      s/ (=|v)//g;
-      " \
-      | command awk '{
+    validated_comparator_set=$(command printf " %s " "$comparator_set" |
+      command sed -E "
+        # exactly 1 space is needed before and after every comparator (including the first and last comparators)
+        s/\011/ /g;s/ +/ /g;
+
+        # normalize all wildcards to x
+        s/X|\*/x/g;
+
+        # space out numbers surrounding '-'
+        s/ ?- ?/ - /g;
+
+        # ' 1 ' => ' 1.x.x '
+        # ' x ' => ' x.x.x '
+        s/ ([0-9]+|x) / \1.x.x /g;
+
+        # ' 1.2 ' => ' 1.2.x '
+        # ' 1.x ' => ' 1.x.x '
+        # ' x.x ' => ' x.x.x '
+        s/ (([0-9]+|x)\.([0-9]+|x)) / \1.x /g;
+
+        # ' 1.2.3 - 1.2.4 ' => ' >=1.2.3 <=1.2.4 '
+        s/ (([0-9]+|x)\.([0-9]+|x)\.([0-9]+|x)) ?\- ?(([0-9]+|x)\.([0-9]+|x)\.([0-9]+|x)) / >=\1 <=\5 /g;
+
+        # ' > 1.2.3 ' => ' >1.2.3 '
+        # ' < 1.2.5 ' => ' <1.2.5 '
+        # ' <= 1.2.3 ' => ' <=1.2.3 '
+        # ' >= 1.2.3 ' => ' >=1.2.3 '
+        # ' = 1.2.3 ' => ' =1.2.3 '
+        # ' ~ 1.2.3 ' => ' ~1.2.3 '
+        # ' ^ 1.2.3 ' => ' ^1.2.3 '
+        # ' v 1.2.3 ' => ' v1.2.3 '
+        s/ (v|<|>|<=|>=|=|~|\^) (([0-9]+|x)\.([0-9]+|x)\.([0-9]+|x)) / \1\2 /g;
+
+        # ' =1.2.3 ' => ' 1.2.3 '
+        # ' v1.2.3 ' => ' 1.2.3 '
+        s/ (=|v)//g;" |
+      command awk '{
         # handle conversions of comparators with ^ or ~ or x into required grammar
         # ` ^0.0.1 ` => ` >=0.0.1 <0.0.2 `
         # ` ^0.1.2 ` => ` >=0.1.2 <0.2.0 `
@@ -462,8 +461,8 @@ nvm_normalize_semver() {
           }
         }
         print output
-      }' \
-      | command sed -E 's/^ +//;s/ +$//'
+      }' |
+      command sed -E 's/^ +//;s/ +$//'
     )
 
     # only comparator_sets composed of the required grammar are marked as valid

test/fast/Unit tests/nvm_normalize_semver

@@ -48,7 +48,7 @@ while [ -n "$test_cases" ]; do
   expected_output=$(echo "$line" | awk -F: '{ print $2 }')
   actual_output=$(nvm_normalize_semver "$input")
   if [ -z "$input" ] || [ "$actual_output" != "$expected_output" ]; then
-    die "nvm_validate_semver test case failed. Expected output: '$expected_output'. Actual output: '$actual_output'. Input: '$input'.\n"
+    die "nvm_normalize_semver test case failed. Expected output: '$expected_output'. Actual output: '$actual_output'. Input: '$input'.\n"
   fi
   test_cases=$(echo "$test_cases" | tail -n +2)
 done