diff options
author | sullrich <sullrich@pfsense.org> | 2009-12-03 19:12:17 -0500 |
---|---|---|
committer | sullrich <sullrich@pfsense.org> | 2009-12-03 19:12:17 -0500 |
commit | e2dc428920337c40a2a0aa2f978a424e86caf239 (patch) | |
tree | d433ecc6f9befbc121b5fe6064e8a8b247cb9477 /etc/phpshellsessions | |
parent | 8cef78c00933157ceb56297054b123d86d8c5d11 (diff) | |
download | pfsense-e2dc428920337c40a2a0aa2f978a424e86caf239.zip pfsense-e2dc428920337c40a2a0aa2f978a424e86caf239.tar.gz |
Do not download entire tree every time, use cached version
Diffstat (limited to 'etc/phpshellsessions')
-rw-r--r-- | etc/phpshellsessions/gitsync | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/gitsync index abf7b60..4f75462 100644 --- a/etc/phpshellsessions/gitsync +++ b/etc/phpshellsessions/gitsync @@ -6,19 +6,12 @@ conf_mount_rw(); -exec("rm -rf /home/pfsense /root/pfsense /pfSenseGITREPO/"); - $GIT_REPO="http://gitweb.pfsense.org/pfsense/mainline.git"; $CODIR = "/root/pfsense/"; global $argv; global $command_split; -echo "\nRemoving downloaded cvssync data, please wait..."; -exec("/bin/rm -rf /home/pfsense"); -exec("mkdir -p /home/pfsense"); -echo " done.\n"; - unlink_if_exists("/tmp/config.cache"); if(!file_exists("/usr/local/bin/git")) { @@ -125,9 +118,14 @@ echo "===> Checking out $branch\n"; exec("mkdir -p /root/pfsense/$branch"); // Git 'er done! -if(is_dir("$CODIR/pfSenseGITREPO")) { - exec("cd $CODIR/pfSenseGITREPO && git fetch"); - exec("cd $CODIR/pfSenseGITREPO && git merge $branch"); +if(is_dir("$CODIR/pfSenseGITREPO/pfSenseGITREPO")) { + echo "===> Fetching updates...\n"; + exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git fetch"); + if($branch == "master") { + exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset $branch --hard"); + } else { + exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset origin/$branch --hard"); + } } else { exec("mkdir -p $CODIR/pfSenseGITREPO"); echo "Executing cd $CODIR/pfSenseGITREPO && git clone $GIT_REPO pfSenseGITREPO\n"; @@ -138,11 +136,13 @@ if(is_dir("$CODIR/pfSenseGITREPO")) { exec("mv $CODIR/pfSenseGITREPO/mainline $CODIR/pfSenseGITREPO/pfSenseGITREPO"); } +/* if($branch == "master") { exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout master"); } else { exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout -b $branch origin/$branch"); } +*/ exec("mkdir -p /tmp/lighttpd/cache/compress/"); |