Revision e623dd70
Added by Scott Ullrich about 16 years ago
| etc/phpshellsessions/cvssync | ||
|---|---|---|
| 58 | 58 |
foreach($branches as $branchname => $branchdesc) {
|
| 59 | 59 |
echo "{$branchname} \t {$branchdesc}\n";
|
| 60 | 60 |
} |
| 61 |
echo "\nOr alternatively you may enter a custom branch URL.\n\n"; |
|
| 61 | 62 |
$branch = readline("> ");
|
| 62 | 63 |
echo "\n"; |
| 63 | 64 |
} else {
|
| ... | ... | |
| 78 | 79 |
$found = true; |
| 79 | 80 |
} |
| 80 | 81 |
if(!$found) {
|
| 81 |
echo "\nInvalid branch.\n"; |
|
| 82 |
exit; |
|
| 82 |
if(isURL($branch)) {
|
|
| 83 |
echo "\n"; |
|
| 84 |
echo "NOTE: $branch was not found.\n\n"; |
|
| 85 |
$command = readline("Is this a custom GIT URL? [y]? ");
|
|
| 86 |
if(strtolower($command) == "y" or $command == "") {
|
|
| 87 |
$GIT_REPO = $branch; |
|
| 88 |
$command = readline("Checkout which branch [master]? ");
|
|
| 89 |
if($command == "") |
|
| 90 |
$branch = "master"; |
|
| 91 |
if($command) |
|
| 92 |
$branch = $command; |
|
| 93 |
$found = true; |
|
| 94 |
} |
|
| 95 |
} |
|
| 96 |
if(!$found) {
|
|
| 97 |
echo "\nNo valid branch found. Exiting.\n\n"; |
|
| 98 |
exit; |
|
| 99 |
} |
|
| 83 | 100 |
} |
| 84 | 101 |
|
| 85 | 102 |
if($branch == "RESTORE" && $g['platform'] == "pfSense") {
|
| ... | ... | |
| 113 | 130 |
exec("cd $CODIR/pfSenseGITREPO && git merge $branch");
|
| 114 | 131 |
} else {
|
| 115 | 132 |
exec("mkdir -p $CODIR/pfSenseGITREPO");
|
| 116 |
echo "Executing cd $CODIR/pfSenseGITREPO && git clone $GIT_REPO pfSenseGITREPO"; |
|
| 133 |
echo "Executing cd $CODIR/pfSenseGITREPO && git clone $GIT_REPO pfSenseGITREPO\n";
|
|
| 117 | 134 |
exec("cd $CODIR/pfSenseGITREPO && git clone $GIT_REPO pfSenseGITREPO");
|
| 118 | 135 |
if(is_dir("$CODIR/pfSenseGITREPO/pfSense"))
|
| 119 | 136 |
exec("mv $CODIR/pfSenseGITREPO/pfSense $CODIR/pfSenseGITREPO/pfSenseGITREPO");
|
| ... | ... | |
| 124 | 141 |
if($branch == "master") {
|
| 125 | 142 |
exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout master");
|
| 126 | 143 |
} else {
|
| 127 |
$current_branch=`git branch | grep $branch`; |
|
| 128 |
if($current_branch == "") {
|
|
| 129 |
exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout -b $branch origin/$branch");
|
|
| 130 |
} else {
|
|
| 131 |
exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout $branch");
|
|
| 132 |
} |
|
| 144 |
exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout -b $branch origin/$branch");
|
|
| 133 | 145 |
} |
| 134 | 146 |
|
| 135 | 147 |
exec("mkdir -p /tmp/lighttpd/cache/compress/");
|
| ... | ... | |
| 201 | 213 |
echo "\n"; |
| 202 | 214 |
} |
| 203 | 215 |
|
| 216 |
function isUrl($url = "") {
|
|
| 217 |
if($url) |
|
| 218 |
if(strstr($url, "rcs.pfsense.org") or |
|
| 219 |
strstr($url, "mainline") or |
|
| 220 |
strstr($url, ".git")) |
|
| 221 |
return true; |
|
| 222 |
return false; |
|
| 223 |
} |
|
| 224 |
|
|
| 204 | 225 |
conf_mount_ro(); |
Also available in: Unified diff
Sync