diff --git a/hwe/sammo/VersionGitDynamic.php b/hwe/sammo/VersionGitDynamic.php index cba19e0a..6ce77a28 100644 --- a/hwe/sammo/VersionGitDynamic.php +++ b/hwe/sammo/VersionGitDynamic.php @@ -19,7 +19,9 @@ class VersionGitDynamic if (is_array($output)) { if (count($output)) { $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 { $versionTokens[] = 'unknown'; } diff --git a/j_updateServer.php b/j_updateServer.php index 53dc3568..7f5b5484 100644 --- a/j_updateServer.php +++ b/j_updateServer.php @@ -1,4 +1,5 @@ $packageJsonHash, - 'updateTimestamp'=>$timestamp, + 'packageJsonHash' => $packageJsonHash, + 'updateTimestamp' => $timestamp, ])); return true; } @@ -108,7 +110,7 @@ function tryNpmInstall() //묻고 따지지 않고 일단 npm install은 시도한다. //hwe 업데이트인 경우에만 한번 더 부른다. -if(tryNpmInstall()){ +if (tryNpmInstall()) { genJS(Util::array_last_key(ServConfig::getServerList())); } $session = Session::requireLogin(null)->setReadOnly();