diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2009-01-20 16:38:01 -0500 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2009-01-20 16:38:01 -0500 |
commit | 29d004b1604c49a3f7252e2f0c227d9c3da79cb6 (patch) | |
tree | a600c27d88b22fa8ffffc9ac6383864db7ac33f0 /etc | |
parent | bd0aa12c1f349b5094a26f762f229295726c4c0b (diff) | |
download | pfsense-29d004b1604c49a3f7252e2f0c227d9c3da79cb6.zip pfsense-29d004b1604c49a3f7252e2f0c227d9c3da79cb6.tar.gz |
Checkout GIT correctly
Diffstat (limited to 'etc')
-rw-r--r-- | etc/phpshellsessions/cvssync | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/cvssync index 0a012d8..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"); +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 && 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 pull && git checkout master"); + exec("cd $CODIR/mainline && git checkout master"); else - exec("cd $CODIR/master/mainline && git pull && 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(); |