mirror of
https://github.com/pfsense/pfsense.git
synced 2025-10-26 11:38:35 +00:00
Operate similar to builder scripts for GIT checkouts
This commit is contained in:
parent
639b68f55c
commit
1cc34c2cef
@ -113,7 +113,11 @@ 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("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") {
|
||||
@ -121,17 +125,17 @@ if($branch == "master") {
|
||||
} else {
|
||||
$current_branch=`git branch | grep $BRANCHTAG`;
|
||||
if($current_branch == "") {
|
||||
exec("cd $CODIR/pfSenseGITREPO && git checkout -b $BRANCHTAG origin/$BRANCHTAG");
|
||||
exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout -b $BRANCHTAG origin/$BRANCHTAG");
|
||||
} else {
|
||||
exec("cd $CODIR/pfSenseGITREPO && git checkout $BRANCHTAG");
|
||||
exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout $BRANCHTAG");
|
||||
}
|
||||
}
|
||||
|
||||
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");
|
||||
@ -155,9 +159,9 @@ exec("rm -f ${CODIR}/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();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user