vool · May 5, 2022 22:39 · Dec 5, 2018 · Dec 5, 2018 · Dec 5, 2018 · Jun 11, 2015
diff --git a/laravel_post_receive hook b/laravel_post_receive hook
@@ -5,7 +5,6 @@ echo "Post receive hook: Updating website"
 echo "********************"
 
 #set the git repo dir
-
 GIT_REPO_DIR=~/git/<repo>.git
 echo "The git repo dir is $GIT_REPO_DIR"
 
@@ -21,11 +20,6 @@ echo 'views cleared'
 
 php artisan migrate --no-interaction
 
-#Bower
-# only run if bower.json has changed 
-
-echo "** Bower **"
-
 # switch to webroot
 cd $GIT_REPO_DIR
 
@@ -37,15 +31,12 @@ changedfiles=( `git diff-tree --no-commit-id --name-only HEAD^ HEAD` )
 #switch back
 cd $WEBROOT
 
-# check if bower has been updated, if so install
-if [[ "${changedfiles[*]}" =~ "bower.json" ]]; then
-    echo "bower has been updated -  installing"
-    bower install
-    echo "bower pruning"
-    bower prune
+# check if node package has been updated, if so install
+if [[ "${changedfiles[*]}" =~ "package.lock" ]]; then
+  echo "package.lock changed: Installing npm dependencies..."
+  npm install
 fi
 
-
 # check if composer has been updated, if so install
 # Check if the composer.lock file is present
 if [[ "${changedfiles[*]}" =~ "composer.lock" ]]; then

diff --git a/laravel_post_receive hook b/laravel_post_receive hook
@@ -9,8 +9,6 @@ echo "********************"
 GIT_REPO_DIR=~/git/<repo>.git
 echo "The git repo dir is $GIT_REPO_DIR"
 
-
-
 WEBROOT=/var/www/<website>
 GIT_WORK_TREE=$WEBROOT git checkout -f
 #change directory to the project dir
@@ -21,8 +19,6 @@ echo 'cache cleared'
 rm -f storage/views/*
 echo 'views cleared'
 
-composer install
-
 php artisan migrate --no-interaction
 
 #Bower

diff --git a/laravel_post_receive hook b/laravel_post_receive hook
@@ -25,9 +25,6 @@ composer install
 
 php artisan migrate --no-interaction
 
-#Basset
-#php artisan basset:build
-
 #Bower
 # only run if bower.json has changed 
 

diff --git a/laravel_post_receive hook b/laravel_post_receive hook
@@ -44,15 +44,22 @@ changedfiles=( `git diff-tree --no-commit-id --name-only HEAD^ HEAD` )
 #switch back
 cd $WEBROOT
 
+# check if bower has been updated, if so install
 if [[ "${changedfiles[*]}" =~ "bower.json" ]]; then
-    echo "bower installing"
+    echo "bower has been updated -  installing"
     bower install
     echo "bower pruning"
     bower prune
 fi
 
 
-
+# check if composer has been updated, if so install
+# Check if the composer.lock file is present
+if [[ "${changedfiles[*]}" =~ "composer.lock" ]]; then
+        # Install or update packages specified in the lock file
+        echo "composer.lock has been updated - do install"
+        composer install --no-dev
+fi
 
 
 php artisan cache:clear
diff --git a/laravel_post_receive hook b/laravel_post_receive hook
@@ -23,7 +23,7 @@ echo 'views cleared'
 
 composer install
 
-php artisan migrate
+php artisan migrate --no-interaction
 
 #Basset
 #php artisan basset:build

diff --git a/laravel_post_receive hook b/laravel_post_receive hook
@@ -4,10 +4,18 @@ echo "********************"
 echo "Post receive hook: Updating website"
 echo "********************"
 
+#set the git repo dir
+
+GIT_REPO_DIR=~/git/<repo>.git
+echo "The git repo dir is $GIT_REPO_DIR"
+
+
+
 WEBROOT=/var/www/<website>
 GIT_WORK_TREE=$WEBROOT git checkout -f
 #change directory to the project dir
 cd $WEBROOT
+
 rm -f storage/cache/*
 echo 'cache cleared'
 rm -f storage/views/*
@@ -23,12 +31,28 @@ php artisan migrate
 #Bower
 # only run if bower.json has changed 
 
-changedfiles=( `git diff-tree --no-commit-id --name-only HEAD@{1} HEAD` )
+echo "** Bower **"
+
+# switch to webroot
+cd $GIT_REPO_DIR
+
+# geting a 'fatal: ambiguous argument' from this ?
+#changedfiles=( `git diff-tree --no-commit-id --name-only HEAD@{1} HEAD` )
+
+changedfiles=( `git diff-tree --no-commit-id --name-only HEAD^ HEAD` )
 
+#switch back
+cd $WEBROOT
+
 if [[ "${changedfiles[*]}" =~ "bower.json" ]]; then
     echo "bower installing"
     bower install
+    echo "bower pruning"
+    bower prune
 fi
 
 
+
+
+
 php artisan cache:clear
diff --git a/laravel_post_receive hook b/laravel_post_receive hook
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 echo "********************"
 echo "Post receive hook: Updating website"

diff --git a/laravel_post_receive hook b/laravel_post_receive hook
@@ -17,6 +17,18 @@ composer install
 
 php artisan migrate
 
-php artisan basset:build
+#Basset
+#php artisan basset:build
+
+#Bower
+# only run if bower.json has changed 
+
+changedfiles=( `git diff-tree --no-commit-id --name-only HEAD@{1} HEAD` )
+
+if [[ "${changedfiles[*]}" =~ "bower.json" ]]; then
+    echo "bower installing"
+    bower install
+fi
+
 
 php artisan cache:clear
diff --git a/laravel_post_receive hook b/laravel_post_receive hook
@@ -4,7 +4,7 @@ echo "********************"
 echo "Post receive hook: Updating website"
 echo "********************"
 
-WEBROOT=/var/www/website
+WEBROOT=/var/www/<website>
 GIT_WORK_TREE=$WEBROOT git checkout -f
 #change directory to the project dir
 cd $WEBROOT

diff --git a/laravel_post_receive hook b/laravel_post_receive hook
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+echo "********************"
+echo "Post receive hook: Updating website"
+echo "********************"
+
+WEBROOT=/var/www/website
+GIT_WORK_TREE=$WEBROOT git checkout -f
+#change directory to the project dir
+cd $WEBROOT
+rm -f storage/cache/*
+echo 'cache cleared'
+rm -f storage/views/*
+echo 'views cleared'
+
+composer install
+
+php artisan migrate
+
+php artisan basset:build
+
+php artisan cache:clear