From e476cab2a14cf77db1eb83d8b0e53e85d7367309 Mon Sep 17 00:00:00 2001
From: wojiushixiaobai <296015668@qq.com>
Date: Fri, 27 Apr 2018 11:01:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=AA=E5=8A=A8=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E8=84=9A=E6=9C=AC=20(#1250)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/upgrade.sh | 49 +++++++++++++++++++-----------------------------
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/utils/upgrade.sh b/utils/upgrade.sh
index 878bf770a..e1cdabb76 100644
--- a/utils/upgrade.sh
+++ b/utils/upgrade.sh
@@ -1,24 +1,14 @@
 #!/bin/bash
 
-if [ ! -d "/opt/py3" ]; then
-echo -e "\033[31m python3虚拟环境不是默认路径 \033[0m"
-ps -ef | grep jumpserver/tmp/beat.pid | grep -v grep
-if [ $? -ne 0 ]
-then
-echo -e "\033[31m jumpserver未运行，请到jumpserver目录使用 ./jms start all -d 启动 \033[0m"
-exit 0
-else 
-echo -e "\033[31m 正在计算python3虚拟环境路径 \033[0m"
-fi
-py3pid=`ps -ef | grep jumpserver/tmp/beat.pid | grep -v grep | awk '{print $2}'`
-py3file=`cat /proc/$py3pid/cmdline`
-py3even=`echo ${py3file%/bin/python3*}`
-echo -e "\033[31m python3虚拟环境路径为$py3even \033[0m"
-source $py3even/bin/activate
+if grep -q 'source ~/.autoenv/activate.sh' ~/.bashrc; then
+    echo -e "\033[31m 正在自动载入 python 环境 \033[0m"
 else
-source /opt/py3/bin/activate
+    echo -e "\033[31m 不支持自动升级，请参考 http://docs.jumpserver.org/zh/docs/upgrade.html 手动升级 \033[0m"
+    exit 0
 fi
 
+source ~/.bashrc
+
 cd `dirname $0`/ && cd .. && ./jms stop
 
 jumpserver_backup=/tmp/jumpserver_backup$(date -d "today" +"%Y%m%d_%H%M%S")
@@ -29,21 +19,20 @@ echo -e "\033[31m 是否需要备份Jumpserver数据库 \033[0m"
 stty erase ^H
 read -p "确认备份请按Y，否则按其他键跳过备份 " a
 if [ "$a" == y -o "$a" == Y ];then
-echo -e "\033[31m 正在备份数据库 \033[0m"
-echo -e "\033[31m 请手动输入数据库信息 \033[0m"
-read -p '请输入Jumpserver数据库ip:' DB_HOST
-read -p '请输入Jumpserver数据库端口:' DB_PORT
-read -p '请输入Jumpserver数据库名称:' DB_NAME
-read -p '请输入有权限导出数据库的用户:' DB_USER
-read -p '请输入该用户的密码:' DB_PASSWORD
-mysqldump -h$DB_HOST -P$DB_PORT -u$DB_USER -p$DB_PASSWORD $DB_NAME > /$jumpserver_backup/$DB_NAME$(date -d "today" +"%Y%m%d_%H%M%S").sql || {
-echo -e "\033[31m 备份数据库失败，请检查输入是否有误 \033[0m"
-exit 1
-}
-echo -e "\033[31m 备份数据库完成 \033[0m"
-
+    echo -e "\033[31m 正在备份数据库 \033[0m"
+    echo -e "\033[31m 请手动输入数据库信息 \033[0m"
+    read -p '请输入Jumpserver数据库ip:' DB_HOST
+    read -p '请输入Jumpserver数据库端口:' DB_PORT
+    read -p '请输入Jumpserver数据库名称:' DB_NAME
+    read -p '请输入有权限导出数据库的用户:' DB_USER
+    read -p '请输入该用户的密码:' DB_PASSWORD
+    mysqldump -h$DB_HOST -P$DB_PORT -u$DB_USER -p$DB_PASSWORD $DB_NAME > /$jumpserver_backup/$DB_NAME$(date -d "today" +"%Y%m%d_%H%M%S").sql || {
+        echo -e "\033[31m 备份数据库失败，请检查输入是否有误 \033[0m"
+        exit 1
+    }
+    echo -e "\033[31m 备份数据库完成 \033[0m"
 else
-echo -e "\033[31m 已取消备份数据库操作 \033[0m"
+    echo -e "\033[31m 已取消备份数据库操作 \033[0m"
 fi
 
 git pull && pip install -r requirements/requirements.txt && cd utils && sh make_migrations.sh