From 3b2c3f0bfc8a4927e5a0b2c616244dcd9f32e5fd Mon Sep 17 00:00:00 2001
From: Lisa Marie Maginnis <lisam@fsf.org>
Date: Mon, 26 Jan 2015 11:00:40 -0500
Subject: [PATCH] Unmerged changes (packaging to agpl, etc)

---
 civicrm-core.git/post-update | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/civicrm-core.git/post-update b/civicrm-core.git/post-update
index ab9665d..05e49c1 100755
--- a/civicrm-core.git/post-update
+++ b/civicrm-core.git/post-update
@@ -1,22 +1,30 @@
 #!/bin/bash
 
 unset GIT_DIR
+remote_user=vcshookuser
 SELF=civicrm-core.git
 REPO_DIR=$HOME/repositories
-CHECKOUT_DIR=$HOME/local/checkouts/deploy-hooks
-TARGET_DIR=/var/www/html/
+CHECKOUT_DIR=$HOME/local/checkouts/civicrm-core
+WEB_ROOT=/var/www/html
+TARGET_DIR=$WEB_ROOT/sites/all/modules/civicrm
+package_host=agpl.fsf.org
+package_path_base=/var/www/agpl.fsf.org/crm.fsf.org
+deploy_script='sudo /usr/local/bin/deploy-civicrm.sh'
 
 case $1 in
     refs/heads/stable)
 	TARGET_HOST=crm.fsf.org
-	branch=master
+	branch=stable
+	package_path=$package_path_base/live
 	;;
     refs/heads/crm-dev)
 	TARGET_HOST=crm-dev.fsf.org
-	branch=stable
+	branch=crm-dev
+	package_path=$package_path_base/devel
 	;;
     *)
 	echo "No action for this branch!"
+	exit 1
 	;;
 esac
 
@@ -24,23 +32,28 @@ esac
 echo "Updating local checkout..."
 if [ ! -d $CHECKOUT_DIR ]; then
     git clone $REPO_DIR/$SELF $CHECKOUT_DIR
-    git checkout $branch
     cd $CHECKOUT_DIR
+    git checkout $branch
 else
     cd $CHECKOUT_DIR
     git checkout $branch
     git pull origin $branch
 fi
+tarball=civicrm-$branch.tar.gz
+
+echo Creating source archive...
+git archive --format=tar.gz --prefix=civicrm/ $branch > ../$tarball
 
-echo "Deploying branch '$branch' to host '$TARGET_HOST'"
+echo Uploading archive to $TARGET_HOST
+scp $CHECKOUT_DIR/../$tarball $remote_user@$TARGET_HOST:
 
-echo "Uploading files to $TARGET_HOST web root..."
-rsync -avrSPX --exclude='.git/' --delete $CHECKOUT_DIR/ 
-   vcshookuser@$TARGET_HOST:$TARGET_DIR
+echo Running deployment script on $TARGET_HOST
+ssh $remote_user@$TARGET_HOST $deploy_script
 
-echo "Fixing permissions on webserver..."
-ssh vcshookuser@$TARGET_HOST 'sudo /usr/local/bin/fixperms.sh'
+echo Uploading archive to agpl.fsf.org...
 
+echo -n $(date "$date_fmt"); echo " - Pushing to packaging server"
+scp $CHECKOUT_DIR/../$tarball $remote_user@$package_host:$package_path/
 
 exec git update-server-info 
 
-- 
2.25.1