Commit 42f6392c authored by ibuler's avatar ibuler

fix install script bug

parent 835e32b1
...@@ -89,7 +89,7 @@ class Setup(object): ...@@ -89,7 +89,7 @@ class Setup(object):
def _run_service(): def _run_service():
os.system('sh %s start' % os.path.join(jms_dir, 'service.sh')) os.system('sh %s start' % os.path.join(jms_dir, 'service.sh'))
print print
color_print('安装成功,请访问web, 祝你使用愉快。请访问 https://github.com/ibuler/jumpserver 查看文档') color_print('安装成功,请访问web, 祝你使用愉快。请访问 https://github.com/ibuler/jumpserver 查看文档', 'green')
def start(self): def start(self):
print "开始安装Jumpserver, 要求环境为 CentOS 6.5 x86_64" print "开始安装Jumpserver, 要求环境为 CentOS 6.5 x86_64"
......
...@@ -53,7 +53,6 @@ stop() { ...@@ -53,7 +53,6 @@ stop() {
echo -n $"Stopping ${PROC_NAME} service:" echo -n $"Stopping ${PROC_NAME} service:"
if [ -e $lockfile ];then
ps aux | grep -E 'manage.py|run_websocket.py' | grep -v grep | awk '{print $2}' | xargs kill -9 &> /dev/null ps aux | grep -E 'manage.py|run_websocket.py' | grep -v grep | awk '{print $2}' | xargs kill -9 &> /dev/null
ret=$? ret=$?
...@@ -66,11 +65,6 @@ stop() { ...@@ -66,11 +65,6 @@ stop() {
echo echo
rm -f "$lockfile" rm -f "$lockfile"
fi fi
else
echo_success
echo
fi
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment