From 6d3ee8116ee0672298d051be7714bfa220879b11 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Fri, 22 Feb 2019 12:48:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/__init__.py            | 2 +-
 apps/templates/_footer.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/__init__.py b/apps/__init__.py
index 49d4c803a..5f076f504 100644
--- a/apps/__init__.py
+++ b/apps/__init__.py
@@ -2,4 +2,4 @@
 # -*- coding: utf-8 -*-
 #
 
-__version__ = "1.4.7"
+__version__ = "1.4.8"
diff --git a/apps/templates/_footer.html b/apps/templates/_footer.html
index a8cd7d9d2..e9f268b1a 100644
--- a/apps/templates/_footer.html
+++ b/apps/templates/_footer.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <div class="footer fixed">
     <div class="pull-right">
-        Version <strong>1.4.7-{% include '_build.html' %}</strong> GPLv2.
+        Version <strong>1.4.8-{% include '_build.html' %}</strong> GPLv2.
         <!--<img style="display: none" src="http://www.jumpserver.org/img/evaluate_avatar1.jpg">-->
     </div>
     <div>

From 3e6e0153cf12c6422e1e99bd4bf745bfab44b2b7 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Fri, 22 Feb 2019 16:14:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9entrypoint?=
 =?UTF-8?q?=E5=B9=B6=E5=A2=9E=E5=8A=A0debug=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entrypoint.sh | 12 ++++++++----
 jms           | 15 +++++++++++++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index a9beb2ef5..41ac2dd33 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -2,15 +2,19 @@
 function cleanup()
 {
     local pids=`jobs -p`
-    if [[ "$pids" != ""  ]]; then
-        kill $pids >/dev/null 2>/dev/null
+    if [[ "${pids}" != ""  ]]; then
+        kill ${pids} >/dev/null 2>/dev/null
     fi
 }
 
 service="all"
-if [ "$1" != "" ];then
+if [[ "$1" != "" ]];then
     service=$1
 fi
 
+if [[ "$1" == "bash" ]];then
+    bash
+fi
+
 trap cleanup EXIT
-python jms start $service
+python jms start ${service}
diff --git a/jms b/jms
index dcf181f81..d7d03d125 100755
--- a/jms
+++ b/jms
@@ -10,9 +10,20 @@ import sys
 import signal
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
-sys.path.append(BASE_DIR)
+sys.path.insert(0, BASE_DIR)
 
-from apps import __version__
+try:
+    from apps import __version__
+except ImportError as e:
+    print("Not found __version__: {}".format(e))
+    print("Sys path: {}".format(sys.path))
+    __version__ = 'Unknown'
+    try:
+        import apps
+        print("List apps: {}".format(os.listdir('apps')))
+        print('apps is: {}'.format(apps))
+    except:
+        pass
 
 try:
     from apps.jumpserver.conf import load_user_config

From ddf60d25124f84ea09abe33baa062fe806744b61 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Fri, 22 Feb 2019 16:33:27 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0jms=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=92=8C=E4=BF=AE=E6=94=B9entrypoint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entrypoint.sh | 5 +++--
 jms           | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 41ac2dd33..f509203d4 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -12,9 +12,10 @@ if [[ "$1" != "" ]];then
     service=$1
 fi
 
+trap cleanup EXIT
 if [[ "$1" == "bash" ]];then
     bash
+else
+    python jms start ${service}
 fi
 
-trap cleanup EXIT
-python jms start ${service}
diff --git a/jms b/jms
index d7d03d125..bb10b7796 100755
--- a/jms
+++ b/jms
@@ -17,6 +17,8 @@ try:
 except ImportError as e:
     print("Not found __version__: {}".format(e))
     print("Sys path: {}".format(sys.path))
+    print("Python is: ")
+    print(subprocess.call('which python', shell=True))
     __version__ = 'Unknown'
     try:
         import apps
@@ -28,7 +30,8 @@ except ImportError as e:
 try:
     from apps.jumpserver.conf import load_user_config
     CONFIG = load_user_config()
-except ImportError:
+except ImportError as e:
+    print("Import error: {}".format(e))
     print("Could not find config file, `cp config_example.yml config.yml`")
     sys.exit(1)