From 0ef3921e176278d7e7560529c607d60b8de18077 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Sep 2019 02:06:49 +0900
Subject: [PATCH] =?UTF-8?q?update=20=EC=84=9C=EB=B2=84=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 i_entrance/j_server_get_admin_status.php |  2 +-
 j_updateServer.php                       | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/i_entrance/j_server_get_admin_status.php b/i_entrance/j_server_get_admin_status.php
index 358df58d..5f4e681d 100644
--- a/i_entrance/j_server_get_admin_status.php
+++ b/i_entrance/j_server_get_admin_status.php
@@ -76,7 +76,7 @@ foreach (AppConf::getList() as $setting) {
         'korName' => $serverKorName,
         'color' => $serverColor,
         'isRoot' => $serverDir == $rootServer,
-        'lastGitPath' => ($serverGitPath[$serverDir][0])??'origin/devel'
+        'lastGitPath' => ($serverGitPath[$serverDir][0])??($serverDir == $rootServer?'devel':'origin/devel')
     ];
     $server[] = $state;
 }  
diff --git a/j_updateServer.php b/j_updateServer.php
index f016e574..300bfa9f 100644
--- a/j_updateServer.php
+++ b/j_updateServer.php
@@ -115,8 +115,9 @@ if(!file_exists($server)){
 
 
 if($server == $baseServerName){
-    exec("git pull -q 2>&1", $output);
-    if($output && $output[0] != 'Already up-to-date.'){
+
+    exec("git fetch 2>&1", $output);
+    if($output){
         Json::die([
             'result'=>false,
             'reason'=>'git pull 작업 : '.join(', ', $output)
@@ -134,6 +135,14 @@ if($server == $baseServerName){
         }
     }
 
+    exec("git pull -q 2>&1", $output);
+    if($output && $output[0] != 'Already up-to-date.'){
+        Json::die([
+            'result'=>false,
+            'reason'=>'git pull 작업 : '.join(', ', $output)
+        ]);
+    }
+
     $version = getVersion();
     $result = Util::generateFileUsingSimpleTemplate(
         __DIR__.'/'.$server.'/d_setting/VersionGit.orig.php',
@@ -142,7 +151,7 @@ if($server == $baseServerName){
         ], true
     );
 
-    $storage->$server = [null, $version];
+    $storage->$server = [$target, $version];
 
     Json::die([
         'server'=>$server,