summaryrefslogtreecommitdiffstats
path: root/etc/phpshellsessions/cvssync
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2009-01-20 16:37:05 -0500
committerScott Ullrich <sullrich@pfsense.org>2009-01-20 16:37:05 -0500
commitf6b84e5b9a761599a413084be1f419e1c52b83b3 (patch)
treec90562c149bc792f8511ebd4b9763c1bf2c90739 /etc/phpshellsessions/cvssync
parent086f0258c3ede9fd49a3aa1372dc423e451af1c9 (diff)
downloadpfsense-f6b84e5b9a761599a413084be1f419e1c52b83b3.zip
pfsense-f6b84e5b9a761599a413084be1f419e1c52b83b3.tar.gz
Checkout correctly
Diffstat (limited to 'etc/phpshellsessions/cvssync')
-rw-r--r--etc/phpshellsessions/cvssync52
1 files changed, 26 insertions, 26 deletions
diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/cvssync
index 864826e..ca3dc24 100644
--- a/etc/phpshellsessions/cvssync
+++ b/etc/phpshellsessions/cvssync
@@ -97,49 +97,49 @@ echo "===> Checking out $branch\n";
exec("mkdir -p /root/pfsense/$branch");
// Git 'er done!
-if(is_dir("$CODIR/master/mainline")) {
- exec("cd $CODIR/master/mainline && git fetch && git merge");
+if(is_dir("$CODIR/mainline")) {
+ exec("cd $CODIR/mainline && git fetch");
} else {
exec("cd $CODIR && git clone $GIT_REPO");
- exec("cd $CODIR/master/mainline && git fetch && git merge && git checkout -b $BRANCHTAG origin/$BRANCHTAG");
+ exec("cd $CODIR/mainline && git fetch && git checkout -b $BRANCHTAG origin/$BRANCHTAG");
}
if($branch == "master")
- exec("cd $CODIR/master/mainline && git checkout master");
+ exec("cd $CODIR/mainline && git checkout master");
else
- exec("cd $CODIR/master/mainline && git checkout $BRANCHTAG");
+ exec("cd $CODIR/mainline && git checkout $BRANCHTAG");
exec("mkdir -p /tmp/lighttpd/cache/compress/");
// Nuke CVS and pfSense tarballs
-exec("cd ${CODIR}/master/mainline && find . -name CVS -exec rm -rf {} \; 2>/dev/null");
-exec("cd ${CODIR}/master/mainline && find . -name pfSense.tgz -exec rm {} \; 2>/dev/null");
+exec("cd ${CODIR}/mainline && find . -name CVS -exec rm -rf {} \; 2>/dev/null");
+exec("cd ${CODIR}/mainline && find . -name pfSense.tgz -exec rm {} \; 2>/dev/null");
// Remove files that we do not want to overwrite the system with
-exec("rm ${CODIR}/master/mainline/usr/local/www/trigger_initial_wizard 2>/dev/null");
-exec("rm ${CODIR}/master/mainline/etc/crontab 2>/dev/null");
-exec("rm ${CODIR}/master/mainline/etc/master.passwd 2>/dev/null");
-exec("rm ${CODIR}/master/mainline/etc/passwd 2>/dev/null");
-exec("rm ${CODIR}/master/mainline/etc/fstab 2>/dev/null");
-exec("rm ${CODIR}/master/mainline/etc/ttys 2>/dev/null");
-exec("rm ${CODIR}/master/mainline/etc/group 2>/dev/null");
-exec("rm ${CODIR}/master/mainline/etc/fstab 2>/dev/null");
-exec("rm ${CODIR}/master/mainline/etc/platform 2>/dev/null");
-exec("rm ${CODIR}/master/mainline/boot/device.hints 2>/dev/null");
-exec("rm ${CODIR}/master/mainline/boot/loader.conf 2>/dev/null");
-exec("rm ${CODIR}/master/mainline/boot/loader.rc 2>/dev/null");
-exec("rm -rf ${CODIR}/master/mainline/conf*");
-exec("rm -rf ${CODIR}/master/mainline/cf 2>/dev/null");
-exec("rm -rf ${CODIR}/master/mainline/root/.shrc");
-exec("rm -rf ${CODIR}/master/mainline/root/.tcshrc");
-exec("rm -f ${CODIR}/master/mainline/etc/syslog.conf 2>/dev/null");
+exec("rm ${CODIR}/mainline/usr/local/www/trigger_initial_wizard 2>/dev/null");
+exec("rm ${CODIR}/mainline/etc/crontab 2>/dev/null");
+exec("rm ${CODIR}/mainline/etc/master.passwd 2>/dev/null");
+exec("rm ${CODIR}/mainline/etc/passwd 2>/dev/null");
+exec("rm ${CODIR}/mainline/etc/fstab 2>/dev/null");
+exec("rm ${CODIR}/mainline/etc/ttys 2>/dev/null");
+exec("rm ${CODIR}/mainline/etc/group 2>/dev/null");
+exec("rm ${CODIR}/mainline/etc/fstab 2>/dev/null");
+exec("rm ${CODIR}/mainline/etc/platform 2>/dev/null");
+exec("rm ${CODIR}/mainline/boot/device.hints 2>/dev/null");
+exec("rm ${CODIR}/mainline/boot/loader.conf 2>/dev/null");
+exec("rm ${CODIR}/mainline/boot/loader.rc 2>/dev/null");
+exec("rm -rf ${CODIR}/mainline/conf*");
+exec("rm -rf ${CODIR}/mainline/cf 2>/dev/null");
+exec("rm -rf ${CODIR}/mainline/root/.shrc");
+exec("rm -rf ${CODIR}/mainline/root/.tcshrc");
+exec("rm -f ${CODIR}/mainline/etc/syslog.conf 2>/dev/null");
echo "===> Installing new files...\n";
if($g['platform'] == "pfSense")
- $command = "cd $CODIR/master/mainline ; tar -cpf - . | (cd / ; tar -Uxpf -)";
+ $command = "cd $CODIR/mainline ; tar -cpf - . | (cd / ; tar -Uxpf -)";
else
- $command = "cd $CODIR/master/mainline ; tar -cpf - . | (cd / ; tar -xpf -) 2>/dev/null";
+ $command = "cd $CODIR/mainline ; tar -cpf - . | (cd / ; tar -xpf -) 2>/dev/null";
exec($command);
post_cvssync_commands();
OpenPOWER on IntegriCloud