From 916d73112cfe1cb7a730f702812cfc895fc272c0 Mon Sep 17 00:00:00 2001 From: xuwei-fit2cloud Date: Tue, 11 Jun 2024 14:45:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E6=97=B6=E5=AE=89=E8=A3=85=E8=B7=AF=E5=BE=84=E8=A2=AB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=BB=98=E8=AE=A4=20/opt=20=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- installer/install.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/installer/install.sh b/installer/install.sh index 5b1c199f38..5cd3712750 100644 --- a/installer/install.sh +++ b/installer/install.sh @@ -33,6 +33,7 @@ function check_and_prepare_env_params() { if [ -f /usr/bin/dectl ]; then # 获取已安装的 DataEase 的运行目录 DE_BASE=$(grep "^DE_BASE=" /usr/bin/dectl | cut -d'=' -f2) + DE_BASE_OLD=$DE_BASE sed -i -e "s#DE_BASE=.*#DE_BASE=${DE_BASE}#g" dectl \cp dectl /usr/local/bin && chmod +x /usr/local/bin/dectl @@ -54,6 +55,10 @@ function check_and_prepare_env_params() { set -a source ${CURRENT_DIR}/install.conf + if [[ $DE_BASE_OLD ]];then + DE_BASE=$DE_BASE_OLD + export DE_BASE=$DE_BASE_OLD + fi if [[ -d $DE_BASE ]] && [[ -f $DE_BASE/dataease2.0/.env ]]; then source $DE_BASE/dataease2.0/.env INSTALL_TYPE='upgrade' @@ -61,7 +66,7 @@ function check_and_prepare_env_params() { conf_install_mode=$(prop $CURRENT_DIR/install.conf DE_INSTALL_MODE) if [[ $DE_INSTALL_MODE == 'community' ]] && [[ $conf_install_mode == 'enterprise' ]];then DE_INSTALL_MODE=$conf_install_mode - export DE_INSTALL_MODE + export DE_INSTALL_MODE=$conf_install_mode fi log_content "升级安装" else