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

fix: origin branch를 제대로 파싱하지 못하는 버그 수정

Browse Source
This commit is contained in:
Hide_D
2021-11-26 18:56:04 +09:00
parent 0f35569e05
commit 4ce49f259d
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/VersionGitDynamic.php
+3 -1
View File
@@ -19,7 +19,9 @@ class VersionGitDynamic
if (is_array($output)) { if (is_array($output)) {
if (count($output)) { if (count($output)) {
$output = $output[1]; $output = $output[1];
$versionTokens[] = trim($output, " \t\n\r\0\x0b*"); $output = trim($output, " \t\n\r\0\x0b*");
$output = explode('/', $output);
$versionTokens[] = Util::array_last($output);
} else { } else {
$versionTokens[] = 'unknown'; $versionTokens[] = 'unknown';
} }
j_updateServer.php
+5 -3
View File
@@ -1,4 +1,5 @@
<?php <?php
namespace sammo; namespace sammo;
require(__DIR__ . '/vendor/autoload.php'); require(__DIR__ . '/vendor/autoload.php');
@@ -28,9 +29,10 @@ function getVersion($target = null)
if (is_array($output)) { if (is_array($output)) {
if (count($output)) { if (count($output)) {
$output = $output[1]; $output = $output[1];
$versionTokens[] = trim($output, " \t\n\r\0\x0b*"); $output = trim($output, " \t\n\r\0\x0b*");
} $output = explode('/', $output);
else{ $versionTokens[] = Util::array_last($output);
} else {
$versionTokens[] = 'unknown'; $versionTokens[] = 'unknown';
} }
} }