small refactoring and fix shellcheck warnings

add.sh

@@ -42,6 +42,6 @@ fi
 
 [ -n "$force" ] && remove_package "$library" "$version"
 
-add_package "$library" "$version" "$main" "$main_minified"
+add_package "$library" "$version" "$main" "$main_minified" || fatal
 
 registry_add_library_version "$library" "$version" "$main" "$main_minified"

check_code.sh

@@ -8,6 +8,10 @@ epm assure shellcheck || exit
 
 EXCL=-eSC2086,SC2039,SC2034,SC2068,SC2155
 
+# taste case
+# SC2002: Useless cat.
+EXCL="$EXCL,SC2002"
+
 if [ -n "$1" ] ; then
     shellcheck $EXCL "$1"
     #checkbashisms -f "$1"
@@ -17,4 +21,4 @@ fi
 #checkbashisms -f *.sh
 #checkbashisms -f Makefile
 
-shellcheck $EXCL *.sh
+shellcheck $EXCL ./*.sh

functions.sh

+#!/bin/bash
+
 fatal () {
     echo "Error: $*" >&2
     exit 1
@@ -37,7 +39,7 @@ create_dist_link () {
     public_base="public/$library/$version"
     library_base="packages/$library/$version/node_modules/$library"
 
-    mkdir -p "$public_base"
+    mkdir -p "$public_base" || fatal
     #if [ -z "$3" ]; then
     #    main_file=$(npm view "$1" main)
     #else
@@ -62,32 +64,29 @@ create_package_version () {
   "description": "",
   "version": "0.1.0",
   "dependencies": {
-EOL
-    echo "    \"$1\": \"$semver_version\"" >> "packages/$1/$2/package.json"
-    cat >> "packages/$1/$2/package.json" << EOL
+      "$1": "$semver_version"
   }
 }
 EOL
 }
 
 install_or_update_package () {
-    cd "packages/$1/$2/"
-    if ! npm i > /dev/null 2>&1; then
-        fatal "Failed to install $1@$2"
-    fi
-    cd ../../../
+    cd "packages/$1/$2/" || fatal
+
+    npm i > /dev/null || fatal "Failed to install $1@$2"
+
+    cd ../../../ || fatal
 }
 
 link_and_print () {
-    if ! [ -e "$1" ]; then
-        fatal "File not found: $1"
-    fi
+    [ -e "$1" ] || fatal "File not found: $1"
+
     ln -f "$1" "$2"
     echo "Created hardlink: $2 -> $1"
 }
 
 registry_add_library_version () {
-    new_registry=$(cat registry.json | jq --arg lib "$1" --arg version "$2" --arg main "$3" --arg minified "$4" ".installedLibraries[\"$1\"][\"$2\"] = {"main": \$main, "minified": \$minified}") || fatal "jq error"
+    new_registry=$(cat registry.json | jq --arg lib "$1" --arg version "$2" --arg main "$3" --arg minified "$4" ".installedLibraries[\"$1\"][\"$2\"] = {\"main\": \$main, \"minified\": \$minified}") || fatal "jq error"
     echo "$new_registry" > registry.json
 }
 

init.sh

@@ -12,4 +12,4 @@ cat >> registry.json << EOL
 EOL
 
 echo "Created new registry.json (list of installed libraries)."
-echo "Now use add.sh to add some libraries."
+echo "Now use './add.sh library version main main-minified' to add some libraries."

update.sh

@@ -21,6 +21,6 @@ if [ -z "$library" ] || [ -z "$version" ]; then
     exit
 fi
 
-registry_package_exists "$library" "$version" || fatal "Package not installed: $library@$version"
+registry_package_exists "$library" "$version" || fatal "Package is not installed: $library@$version"
 
 update_package "$library" "$version"