From dbc877023b7113d32173d2e652dc4332138b4c9c Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 1 Apr 2018 03:31:03 +0900
Subject: [PATCH] =?UTF-8?q?updateServer=EC=97=90=20'=EB=A7=88=EC=A7=80?=
 =?UTF-8?q?=EB=A7=89=20=EC=84=9C=EB=B2=84'=EC=9D=B8=20=EA=B2=BD=EC=9A=B0?=
 =?UTF-8?q?=EC=97=90=EB=8A=94=20git=20pull=EC=9D=84=20=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 j_updateServer.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/j_updateServer.php b/j_updateServer.php
index 39540210..476e059e 100644
--- a/j_updateServer.php
+++ b/j_updateServer.php
@@ -34,7 +34,7 @@ $baseServerName = end(array_keys(AppConf::getList()));
 
 $targetDir =$target.':'.$baseServerName;
 
-if($server == $baseServerName || !key_exists($server, AppConf::getList())){
+if(!key_exists($server, AppConf::getList())){
     Json::die([
         'result'=>false,
         'reason'=>'불가능한 서버 이름입니다.'
@@ -65,6 +65,25 @@ if(!file_exists($server)){
     mkdir($server, 0644);
 }
 
+
+if($server == $baseServerName){
+
+    exec("git pull 2>&1", $output);
+    if($output && $output[0] != 'Already up-to-date.'){
+        Json::die([
+            'result'=>false,
+            'reason'=>'git pull 작업 : '.join(', ', $output)
+        ]);
+    }
+
+    //TODO: 버전명을 기록.
+
+    Json::die([
+        'result'=>true,
+    ]);
+
+}
+
 exec("git fetch 2>&1", $output);
 if($output){
     Json::die([