server checkout 추가2
This commit is contained in:
+16
-4
@@ -58,12 +58,13 @@ if(!$allowUpdate){
|
||||
]);
|
||||
}
|
||||
|
||||
$src_target = $storage->$server;
|
||||
if($src_target){
|
||||
$src_target = $src_target[0];
|
||||
}
|
||||
|
||||
if(!$allowFullUpdate || !$target){
|
||||
$target = $storage->$server;
|
||||
if($target){
|
||||
$target = $target[0];
|
||||
}
|
||||
$target = $src_target;
|
||||
}
|
||||
else{
|
||||
$target = $request['target'];
|
||||
@@ -122,6 +123,17 @@ if($server == $baseServerName){
|
||||
]);
|
||||
}
|
||||
|
||||
if($target != $src_target){
|
||||
$command = sprintf('git checkout %s -q 2>&1', $target);
|
||||
exec($command, $output);
|
||||
if($output){
|
||||
Json::die([
|
||||
'result'=>false,
|
||||
'reason'=>join(', ', $output)
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
$version = getVersion();
|
||||
$result = Util::generateFileUsingSimpleTemplate(
|
||||
__DIR__.'/'.$server.'/d_setting/VersionGit.orig.php',
|
||||
|
||||
Reference in New Issue
Block a user