summaryrefslogtreecommitdiffstats
path: root/etc/phpshellsessions
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2009-01-20 16:12:57 -0500
committerScott Ullrich <sullrich@pfsense.org>2009-01-20 16:12:57 -0500
commit35a98a24f6328f7328d6a709986b1525e695c89a (patch)
tree43af8d489f07c2e3dc33481ee94d9065f8fad2e7 /etc/phpshellsessions
parentd378a8bc50c594d4e75b993242183c5759874e06 (diff)
downloadpfsense-35a98a24f6328f7328d6a709986b1525e695c89a.zip
pfsense-35a98a24f6328f7328d6a709986b1525e695c89a.tar.gz
Correctly checkout GIT
Diffstat (limited to 'etc/phpshellsessions')
-rw-r--r--etc/phpshellsessions/cvssync10
1 files changed, 6 insertions, 4 deletions
diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/cvssync
index 75662a8..30af6d6 100644
--- a/etc/phpshellsessions/cvssync
+++ b/etc/phpshellsessions/cvssync
@@ -97,15 +97,17 @@ 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 pull $BRANCHTAG");
-else
+if(is_dir("$CODIR/master/mainline")) {
+ exec("cd $CODIR/master/mainline && git pull");
+} else {
exec("cd $CODIR && git clone $GIT_REPO");
+ exec("cd $CODIR/master/mainline && git checkout -b $BRANCHTAG origin/$BRANCHTAG");
+}
if($branch == "master")
exec("cd $CODIR/master/mainline && git checkout master");
else
- exec("cd $CODIR/master/mainline && git checkout -b $BRANCHTAG origin/$BRANCHTAG");
+ exec("cd $CODIR/master/mainline && git checkout $BRANCHTAG");
exec("mkdir -p /tmp/lighttpd/cache/compress/");
OpenPOWER on IntegriCloud