From 951dc1fa9e6d519fc9e8a45f1d1126490ad37875 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alex@spline.inf.fu-berlin.de>
Date: Mon, 20 Aug 2012 21:41:31 +0200
Subject: cyrax-build: do not delete other branches on update

---
 post-receive.cyrax-build | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/post-receive.cyrax-build b/post-receive.cyrax-build
index a564c79..fcb816d 100755
--- a/post-receive.cyrax-build
+++ b/post-receive.cyrax-build
@@ -8,18 +8,20 @@ while read old new ref ; do
 	if [ "$BRANCH" = "master" ]; then
 		TARGET_DIR="${WEB_BASE}/www.spline.de/htdocs/"
 		URL="http://www.spline.de/"
+		RELATIVE=""
 	else
 		TARGET_DIR="${WEB_BASE}/branches.spline.de/htdocs/"
 		URL="http://branches.spline.de/${BRANCH}/"
-	fi
-
-
-	if [ "${new}" = "0000000000000000000000000000000000000000" ]; then
-		rm -rf "${TARGET_DIR}"
-		exit 0
+		RELATIVE="${BRANCH}"
+	
+		if [ "${new}" = "0000000000000000000000000000000000000000" ]; then
+			rm -rf "${TARGET_DIR}/${BRANCH}/"
+			exit 0
+		fi
 	fi
 
 	TMP_DIR=$(mktemp -d)
+	TARGET_TMP_DIR=$(mktemp -d)
 	git archive "${BRANCH}" | tar -C "${TMP_DIR}" -xf - >/dev/null 2>&1
 
 	# customize url in settings.cfg
@@ -27,10 +29,15 @@ while read old new ref ; do
 
 	# build website
 	. /home/wartung/cyrax_env/bin/activate
-	mkdir -p "${TARGET_DIR}"
-	cyrax -q -d ${TARGET_DIR} ${TMP_DIR}
-
-	rm -rf ${TMP_DIR}
+	mkdir -p "${TARGET_TMP_DIR}"
+	cyrax -q -d ${TARGET_TMP_DIR} ${TMP_DIR}
+	
+	mkdir -p "${TARGET_DIR}/${RELATIVE}/"
+	rm -rf "${TARGET_DIR}/${RELATIVE}/"
+	mv "${TARGET_TMP_DIR}/${RELATIVE}/" "${TARGET_DIR}/${RELATIVE}/"
+	
+	rm -rf "${TMP_DIR}"
+	rm -rf "${TARGET_TMP_DIR}"
 
 	echo
 	echo "Seite befindet sich nun auf:"
-- 
cgit v1.2.3-1-g7c22