From 4ce49f259d2a209fd2dd92598382514f757a19b0 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 26 Nov 2021 18:56:04 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20origin=20branch=EB=A5=BC=20=EC=A0=9C?=
 =?UTF-8?q?=EB=8C=80=EB=A1=9C=20=ED=8C=8C=EC=8B=B1=ED=95=98=EC=A7=80=20?=
 =?UTF-8?q?=EB=AA=BB=ED=95=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/VersionGitDynamic.php |  4 +++-
 j_updateServer.php              | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

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 @@
 <?php
+
 namespace sammo;
 
 require(__DIR__ . '/vendor/autoload.php');
@@ -26,11 +27,12 @@ function getVersion($target = null)
     }
     exec($command, $output);
     if (is_array($output)) {
-        if(count($output)){
+        if (count($output)) {
             $output = $output[1];
-            $versionTokens[] = trim($output, " \t\n\r\0\x0b*");
-        }
-        else{
+            $output = trim($output, " \t\n\r\0\x0b*");
+            $output = explode('/', $output);
+            $versionTokens[] = Util::array_last($output);
+        } else {
             $versionTokens[] = 'unknown';
         }
     }
@@ -81,7 +83,7 @@ function tryNpmInstall()
             }
 
             //2. package-lock.json 업데이트가 2주를 초과했다면 업데이트.
-            if($oldTimestamp + 60*60*24*14 < $timestamp){
+            if ($oldTimestamp + 60 * 60 * 24 * 14 < $timestamp) {
                 break;
             }
 
@@ -99,8 +101,8 @@ function tryNpmInstall()
     }
 
     file_put_contents($npmResultPath, json_encode([
-        'packageJsonHash'=>$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();