diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2009-01-20 20:34:56 -0500 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2009-01-20 20:34:56 -0500 |
commit | 2ac39ce3d7f19a8f267f5c1d03636986a0b19e47 (patch) | |
tree | 51c8d87391638e1593c563545470cb384dffb263 /etc/phpshellsessions | |
parent | 2b2f43c2753f00cdfaba0ddc35f7cdc5924cb97b (diff) | |
download | pfsense-2ac39ce3d7f19a8f267f5c1d03636986a0b19e47.zip pfsense-2ac39ce3d7f19a8f267f5c1d03636986a0b19e47.tar.gz |
Use /root/pfSenseGITREPO for checkouts
Diffstat (limited to 'etc/phpshellsessions')
-rw-r--r-- | etc/phpshellsessions/cvssync | 58 |
1 files changed, 30 insertions, 28 deletions
diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/cvssync index 0800c86..8617a5e 100644 --- a/etc/phpshellsessions/cvssync +++ b/etc/phpshellsessions/cvssync @@ -25,6 +25,9 @@ if(!file_exists("/usr/local/bin/git")) { system("chmod a+rx /usr/local/bin/git"); } +if(is_dir("/root/pfsense/mainline")) + exec("rm -rf /root/pfsense/mainline"); + /* NOTE: Set branches here */ $branches = array( "master" => "2.0 development branch", @@ -97,54 +100,53 @@ echo "===> Checking out $branch\n"; exec("mkdir -p /root/pfsense/$branch"); // Git 'er done! -if(is_dir("$CODIR/mainline")) { - exec("cd $CODIR/mainline && git fetch"); +if(is_dir("$CODIR/pfSenseGITREPO")) { + exec("cd $CODIR/pfSenseGITREPO && git fetch"); } else { - exec("cd $CODIR && git clone $GIT_REPO"); - exec("cd $CODIR/mainline && git fetch"); + exec("cd $CODIR && git clone $GIT_REPO pfSenseGITREPO"); } if($branch == "master") { - exec("cd $CODIR/mainline && git checkout master"); + exec("cd $CODIR/pfSenseGITREPO && git checkout master"); } else { $current_branch=`git branch | grep $BRANCHTAG`; if($current_branch == "") - exec("cd $CODIR/mainline && git fetch && git checkout -b $BRANCHTAG origin/$BRANCHTAG"); + exec("cd $CODIR/pfSenseGITREPO && git fetch && git checkout -b $BRANCHTAG origin/$BRANCHTAG"); else - exec("cd $CODIR/mainline && git checkout $BRANCHTAG"); + exec("cd $CODIR/pfSenseGITREPO && git checkout $BRANCHTAG"); } exec("mkdir -p /tmp/lighttpd/cache/compress/"); // Nuke CVS and pfSense tarballs -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"); +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"); // Remove files that we do not want to overwrite the system with -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"); +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"); echo "===> Installing new files...\n"; if($g['platform'] == "pfSense") - $command = "cd $CODIR/mainline ; tar -cpf - . | (cd / ; tar -Uxpf -)"; + $command = "cd $CODIR/pfSenseGITREPO ; tar -cpf - . | (cd / ; tar -Uxpf -)"; else - $command = "cd $CODIR/mainline ; tar -cpf - . | (cd / ; tar -xpf -) 2>/dev/null"; + $command = "cd $CODIR/pfSenseGITREPO ; tar -cpf - . | (cd / ; tar -xpf -) 2>/dev/null"; exec($command); post_cvssync_commands(); |