From 72374d82141df5a3f551c9f23f383061723e7d8c Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sun, 1 Feb 2009 00:09:35 -0500
Subject: Unbreak RELENG_1_2 checkouts

---
 etc/phpshellsessions/cvssync | 58 ++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 26 deletions(-)

(limited to 'etc/phpshellsessions/cvssync')

diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/cvssync
index bfab2be..7570c08 100644
--- a/etc/phpshellsessions/cvssync
+++ b/etc/phpshellsessions/cvssync
@@ -21,7 +21,7 @@ unlink_if_exists("/tmp/config.cache");
 
 if(!file_exists("/usr/local/bin/git")) {
 	echo "Cannot find git, fetching static git...";
-	system("pkg_add -r git");
+    system("pkg_add -r git");
 }
 
 # Remove mainline if exists (older)
@@ -112,51 +112,57 @@ if(is_dir("$CODIR/pfSenseGITREPO")) {
 	exec("cd $CODIR/pfSenseGITREPO && git fetch");
 	exec("cd $CODIR/pfSenseGITREPO && git merge $branch");	
 } else {
-	exec("cd $CODIR && git clone $GIT_REPO pfSenseGITREPO");
+    exec("mkdir -p $CODIR/pfSenseGITREPO");
+    echo "Executing cd $CODIR/pfSenseGITREPO && git clone $GIT_REPO pfSenseGITREPO";
+	exec("cd $CODIR/pfSenseGITREPO && git clone $GIT_REPO pfSenseGITREPO");
+	if(is_dir("$CODIR/pfSenseGITREPO/pfSense")) 
+		exec("mv $CODIR/pfSenseGITREPO/pfSense $CODIR/pfSenseGITREPO/pfSenseGITREPO");
+	if(is_dir("$CODIR/pfSenseGITREPO/mainline")) 
+		exec("mv $CODIR/pfSenseGITREPO/mainline $CODIR/pfSenseGITREPO/pfSenseGITREPO");
 }
 
 if($branch == "master") {
 	exec("cd $CODIR/pfSenseGITREPO && git checkout master");
 } else {
-	$current_branch=`git branch | grep $BRANCHTAG`;
+	$current_branch=`git branch | grep $branch`;
 	if($current_branch == "") {
-		exec("cd $CODIR/pfSenseGITREPO && git checkout -b $BRANCHTAG origin/$BRANCHTAG");
+		exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout -b $BRANCHTAG origin/$branch");
 	} else {
-		exec("cd $CODIR/pfSenseGITREPO && git checkout $BRANCHTAG");
+		exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout $branch");
 	}
 }
 
 exec("mkdir -p /tmp/lighttpd/cache/compress/");
 
 // Nuke CVS and pfSense tarballs
-exec("cd ${CODIR}/pfSenseGITREPO/ && find . -name CVS -exec rm -rf {} \; 2>/dev/null");
-exec("cd ${CODIR}/pfSenseGITREPO/ && find . -name pfSense.tgz -exec rm {} \; 2>/dev/null");
+exec("cd ${CODIR}/pfSenseGITREPO/pfSenseGITREPO && find . -name CVS -exec rm -rf {} \; 2>/dev/null");
+exec("cd ${CODIR}/pfSenseGITREPO/pfSenseGITREPO && find . -name pfSense.tgz -exec rm {} \; 2>/dev/null");
 
 // Remove files that we do not want to overwrite the system with 
-exec("rm ${CODIR}/pfSenseGITREPO/usr/local/www/trigger_initial_wizard 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/etc/crontab 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/etc/master.passwd 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/etc/passwd 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/etc/fstab 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/etc/ttys 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/etc/group 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/etc/fstab 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/etc/platform 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/boot/device.hints 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/boot/loader.conf 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/boot/loader.rc 2>/dev/null");
-exec("rm -rf ${CODIR}/pfSenseGITREPO/conf*");
-exec("rm -rf ${CODIR}/pfSenseGITREPO/cf 2>/dev/null");
-exec("rm -rf ${CODIR}/pfSenseGITREPO/root/.shrc");
-exec("rm -rf ${CODIR}/pfSenseGITREPO/root/.tcshrc");
-exec("rm -f ${CODIR}/pfSenseGITREPO/etc/syslog.conf 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/usr/local/www/trigger_initial_wizard 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/crontab 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/master.passwd 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/passwd 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/fstab 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/ttys 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/group 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/fstab 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/platform 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/boot/device.hints 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/boot/loader.conf 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/boot/loader.rc 2>/dev/null");
+exec("rm -rf ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/conf*");
+exec("rm -rf ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/cf 2>/dev/null");
+exec("rm -rf ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/root/.shrc");
+exec("rm -rf ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/root/.tcshrc");
+exec("rm -f ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/syslog.conf 2>/dev/null");
 
 echo "===> Installing new files...\n";
 
 if($g['platform'] == "pfSense") 
-	$command = "cd $CODIR/pfSenseGITREPO ; tar -cpf - . | (cd / ; tar -Uxpf -)";
+	$command = "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO ; tar -cpf - . | (cd / ; tar -Uxpf -)";
 else 
-	$command = "cd $CODIR/pfSenseGITREPO ; tar -cpf - . | (cd / ; tar -xpf -) 2>/dev/null";
+	$command = "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO ; tar -cpf - . | (cd / ; tar -xpf -) 2>/dev/null";
 exec($command);
 
 post_cvssync_commands();
-- 
cgit v1.1