devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

fix: branch 못 알아낸 건 unknown으로 하기

Browse Source
This commit is contained in:
Hide_D
2021-11-26 19:11:50 +09:00
parent f9b592fec7
commit e845777735
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/VersionGitDynamic.php
+2 -2
View File
@@ -17,8 +17,8 @@ class VersionGitDynamic
$command = 'git branch --contains HEAD'; $command = 'git branch --contains HEAD';
exec($command, $output); exec($command, $output);
if (is_array($output)) { if (is_array($output)) {
if (count($output)) { if (count($output) > 1) {
$output = Util::array_last($output); $output = $output[1];
$output = trim($output, " \t\n\r\0\x0b*"); $output = trim($output, " \t\n\r\0\x0b*");
$output = explode('/', $output); $output = explode('/', $output);
$versionTokens[] = Util::array_last($output); $versionTokens[] = Util::array_last($output);
j_updateServer.php
+7 -4
View File
@@ -9,6 +9,9 @@ set_time_limit(600);
function getVersion($target = null) function getVersion($target = null)
{ {
$versionTokens = []; $versionTokens = [];
if ($target) {
$target = trim($target);
}
if ($target) { if ($target) {
$command = sprintf('git describe %s --long --tags', escapeshellarg($target)); $command = sprintf('git describe %s --long --tags', escapeshellarg($target));
@@ -21,14 +24,14 @@ function getVersion($target = null)
} }
if ($target) { if ($target) {
$command = sprintf('git branch --contains %s', escapeshellarg($target)); $command = sprintf('git branch -a --contains %s', escapeshellarg($target));
} else { } else {
$command = 'git branch --contains HEAD'; $command = 'git branch -a --contains HEAD';
} }
exec($command, $output); exec($command, $output);
if (is_array($output)) { if (is_array($output)) {
if (count($output)) { if (count($output) > 1) {
$output = Util::array_last($output); $output = $output[1];
$output = trim($output, " \t\n\r\0\x0b*"); $output = trim($output, " \t\n\r\0\x0b*");
$output = explode('/', $output); $output = explode('/', $output);
$versionTokens[] = Util::array_last($output); $versionTokens[] = Util::array_last($output);