fix(gitutils): 🐛 correct install-plugins in commit hooks

Author: tomgrv

src/githooks/_commit-msg.sh

@@ -7,7 +7,7 @@ if [ -t 1 ]; then
 fi
 
 # Install commitizen plugins
-git hook run install-plugins -- '.commitlint.extends//""'
+git hook run install-plugins -- '[.config.commitizen.path // "", .commitlint.extends // ""]'
 
 # Apply commitlint rules to the latest commit message
 zz_log i "Applying commitlint rules to the latest commit..."

src/githooks/_install-plugins.sh

@@ -1,10 +1,24 @@
 #!/bin/sh
 
-json_key=$1
-json_file=${2:-./package.json}
+# Function to print help and manage arguments
+
+eval $(
+    zz_args "Install npm plugins from package.json configuration" $0 "$@" <<-help
+        f file      json_file   Package.json file path (default: ./package.json)
+        - key       json_key    JSON key path to extract plugins from
+help
+)
+
+# Set defaults if not provided
+json_file=${json_file:-./package.json}
+
+if [ -z "$json_key" ]; then
+    zz_log e "JSON key is required."
+    exit 1
+fi
 
 zz_log i "Using file {B $json_file}..."
-plugins=$(jq -r "$1" "$json_file" | tr -d "'[]:,\"")
+plugins=$(jq -r "$json_key" "$json_file" | tr -d "'[]:,\"")
 
 if [ -z "$plugins" ]; then
     zz_log w "No plugins found at key {B $json_key} in {U $json_file}"
@@ -14,30 +28,39 @@ fi
 # Load the config file
 config=$(dirname $0)/.ci-plugins
 
+# if config file only contains comments and empty lines, make it empty
+if [ -f "$config" ] && [ -z "$(grep -v -e '^#' -e '^$' $config)" ]; then
+    zz_log w "Config file {B $config} is empty or contains only comments, reset it."
+    cat /dev/null >$config
+fi  
+
+# Create the config file if it doesn't exist
+if [ ! -f "$config" ]; then
+    zz_log w "Config file {B $config} does not exist, create it."
+    touch $config
+fi
+
 # foreach plugin, check if it is already installed
 for plugin in $plugins; do
-
-    if ! npm list $plugin 2>/dev/null 1>&2; then
-        # Save the plugins to a config file
-        zz_log i "Adding plugin {B $plugin} to list of CI dependencies ..."
-        echo "$plugin" | sed 's/^ *//;s/ *$//' | grep -v --file=$config >>$config
-    fi
+    echo "$plugin" | sed 's/^ *//;s/ *$//' | grep -v --file=$config >>$config
 done
 
 # Reload the plugins list
 plugins=$(cat $config | grep -v '^$' | tr '\n' ' ')
 
-# If no plugins are left, exit
-if [ -z "$plugins" ]; then
-    zz_log w "No plugins to install!"
-    exit 0
-fi
-
-# Install the plugins
-zz_log i "Installing plugins {B $plugins} ..."
-if ! npm install --no-save $plugins 2>/dev/null 1>&2; then
-    zz_log e "Failed to install one of plugins {B $plugins}!"
-    exit 1
-fi
+# For each plugin, check if it is already installed
+for plugin in $plugins; do
+    if npm list --depth=0 | grep -q "$plugin@"; then
+        plugins=$(echo $plugins | sed "s#$plugin##g" | tr -s ' ')
+    fi
+done
 
-zz_log s "Plugins {B $plugins} installed successfully!"
+# Install the plugins if there are any to install
+if [ -n "$plugins" ]; then
+    zz_log i "Installing plugins {B $plugins} ..."
+    if ! npm install --no-save $plugins 2>/dev/null 1>&2; then
+        zz_log e "Failed to install one of plugins {B $plugins}!"
+        exit 1
+    fi
+    zz_log s "Plugins {B $plugins} installed successfully!"
+fi

src/githooks/_prepare-commit-msg.sh

@@ -8,7 +8,9 @@ if [ -t 1 ]; then
 fi
 
 # Install commitizen plugins
-git hook run install-plugins -- '.config.commitizen.path//""'
+git hook run install-plugins -- '[.config.commitizen.path // "", .commitlint.extends // ""]'
+
+
 
 # Edit commit message
 if [ $(grep -cv -e '^#' -e '^$' .git/COMMIT_EDITMSG) -eq 0 ]; then