#912: fix call to git diff

Accenture · May 17, 2023 · 48a19da · 48a19da
1 parent 13de337
commit 48a19da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/.husky/post-checkout b/.husky/post-checkout
@@ -10,24 +10,17 @@ echo "#$TICKETID: " > ".git/templatemessage"
 
 
 # ### run npm install ###
-echo "[POST-CHECKOUT-1]"
 IFS=$'\n'
-echo "[POST-CHECKOUT-2]"
-# regex supports mono-repos with a package.json at root-level and at package-level
-PACKAGE_LOCK_REGEX="(^packages\/.*\/package-lock\.json)|(^package-lock\.json)"
-echo "[POST-CHECKOUT-3]"
 # extract all paths to package-lock.json files 
-PACKAGES=("git diff --name-only HEAD@{1} HEAD | grep -E "$PACKAGE_LOCK_REGEX)
+PACKAGES=`git diff --name-only HEAD^1 HEAD | grep -E '(^package-lock\.json)'`
 echo "[POST-CHECKOUT-4]"
 
 if [[ ${PACKAGES[@]} ]]; then
   for package in $PACKAGES; do
     echo "[POST-CHECKOUT]"
     echo "📦 $package was changed. Running npm install to update your dependencies..."
-    # DIR=$(dirname package)
-    # cd "$DIR" && npm install
+    npm install
   done
-  npm install
 else
   echo "📦 All packages up-to-date. No need to run npm install."
 fi
diff --git a/.husky/post-merge b/.husky/post-merge
@@ -4,22 +4,16 @@
 echo "[POST-MERGE-1]"
 
 IFS=$'\n'
-echo "[POST-MERGE-2]"
-# regex supports mono-repos with a package.json at root-level and at package-level
-PACKAGE_LOCK_REGEX="(^packages\/.*\/package-lock\.json)|(^package-lock\.json)"
-echo "[POST-MERGE-3]"
 # extract all paths to package-lock.json files 
-PACKAGES=("git diff --name-only HEAD@{1} HEAD | grep -E "$PACKAGE_LOCK_REGEX)
+PACKAGES=`git diff --name-only HEAD^1 HEAD | grep -E '(^package-lock\.json)'`
 echo "[POST-MERGE-4]"
 
 if [[ ${PACKAGES[@]} ]]; then
   for package in $PACKAGES; do
     echo "[POST-MERGE]"
     echo "📦 $package was changed. Running npm install to update your dependencies..."
-    # DIR=$(dirname package)
-    # cd "$DIR" && npm install
+    npm install
   done
-  npm install
 else
   echo "📦 All packages up-to-date. No need to run npm install."
 fi