From ff001fcffe2c6820919f837313a2924c5c508693 Mon Sep 17 00:00:00 2001 From: Lisa Marie Maginnis Date: Mon, 6 Oct 2014 15:10:14 -0400 Subject: [PATCH] Slight fixes to civicrm-core hooks --- civicrm-core.git/post-update | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/civicrm-core.git/post-update b/civicrm-core.git/post-update index 8411e95..ab9665d 100755 --- a/civicrm-core.git/post-update +++ b/civicrm-core.git/post-update @@ -7,11 +7,11 @@ CHECKOUT_DIR=$HOME/local/checkouts/deploy-hooks TARGET_DIR=/var/www/html/ case $1 in - refs/heads/master) + refs/heads/stable) TARGET_HOST=crm.fsf.org branch=master ;; - refs/heads/stable) + refs/heads/crm-dev) TARGET_HOST=crm-dev.fsf.org branch=stable ;; @@ -32,16 +32,15 @@ else git pull origin $branch fi -if [ -n TARGET_HOST ]; then - echo "Deploying branch '$branch' to host '$TARGET_HOST'" +echo "Deploying branch '$branch' to host '$TARGET_HOST'" - echo "Uploading files to $TARGET_HOST web root..." - rsync -avrSPX --exclude='.git/' --delete $CHECKOUT_DIR/ - vcshookuser@$TARGET_HOST:$TARGET_DIR +echo "Uploading files to $TARGET_HOST web root..." +rsync -avrSPX --exclude='.git/' --delete $CHECKOUT_DIR/ + vcshookuser@$TARGET_HOST:$TARGET_DIR + +echo "Fixing permissions on webserver..." +ssh vcshookuser@$TARGET_HOST 'sudo /usr/local/bin/fixperms.sh' - echo "Fixing permissions on webserver..." - ssh vcshookuser@$TARGET_HOST 'sudo /usr/loca/bin/fixperms.sh' -fi exec git update-server-info -- 2.25.1