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