some taste fixes

add.sh

@@ -14,19 +14,21 @@ fi
 
 re='^[0-9\.]+$'
 
-if ! [[ $2 =~ $re ]] && [ "$2" != "latest" ]; then
-    echo "Bad version: $2"
-    exit 1
-fi
-
-epm assure jq || exit
-
 library="$1"
 version="$2"
 main="$3"
 main_minified="$4"
 
-if ! npm view "$1" > /dev/null 2>&1; then
+# note: do not quote regexp here (SC2076)
+if ! [[ "$version" =~ $re ]] && [ "$version" != "latest" ]; then
+    fatal "Bad version: $version"
+fi
+
+epm assure jq || exit
+epm assure npm || exit
+
+
+if ! npm view "$library" > /dev/null ; then
     echo 'Failed to get package info. Are you sure it exists?'
     echo 'If not sure, check npm-debug.log for details.'
     exit 1
@@ -34,4 +36,5 @@ fi
 
 
 add_package "$library" "$version" "$main" "$main_minified"
+
 registry_add_library_version "$library" "$version" "$main" "$main_minified"

functions.sh

@@ -86,19 +86,19 @@ registry_add_library_version () {
 }
 
 registry_get_libraries () {
-    echo $(cat registry.json | jq -r ".installedLibraries | keys[]")
+    cat registry.json | jq -r ".installedLibraries | keys[]"
 }
 
 registry_get_library_versions () {
-    echo $(cat registry.json | jq -r ".installedLibraries[\"$1\"] | keys[]")
+    cat registry.json | jq -r ".installedLibraries[\"$1\"] | keys[]"
 }
 
 registry_get_package_main () {
-    echo $(cat registry.json | jq -r ".installedLibraries[\"$1\"][\"$2\"].main")
+    cat registry.json | jq -r ".installedLibraries[\"$1\"][\"$2\"].main"
 }
 
 registry_get_package_main_minified () {
-    echo $(cat registry.json | jq -r ".installedLibraries[\"$1\"][\"$2\"].minified")
+    cat registry.json | jq -r ".installedLibraries[\"$1\"][\"$2\"].minified"
 }
 
 registry_package_exists () {
@@ -111,7 +111,7 @@ update_all_packages () {
 
     echo "----------"
     for library in $libraries; do
-        local versions=$(registry_get_library_versions "$library")
+        local versions="$(registry_get_library_versions "$library")"
         for version in $versions; do
             echo "Updating $library@$version:"
             update_package "$library" "$version"

update.sh

@@ -9,19 +9,18 @@ if [ "$1" == '-h' ] || [ "$1" == '--help' ] || [ $# -eq 1 ] ; then
 fi
 
 epm assure jq || exit
+epm assure npm || exit
 
 library="$1"
 version="$2"
 
-
+# TODO: allow update all versions of a library
 if [ -z "$library" ] || [ -z "$version" ]; then
     echo 'Updating all packages from registry.json...'
     update_all_packages
-else
-    if registry_package_exists "$library" "$version"; then
-        update_package "$library" "$version"
-    else
-        echo "Package not installed: $library@$version"
-        exit 1
-    fi
+    exit
 fi
+
+registry_package_exists "$library" "$version" || fatal "Package not installed: $library@$version"
+
+update_package "$library" "$version"