center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #10183 from dataease/pr@dev-v2_fix_install_path

Browse Source 
fix: 修复升级时安装路径被修改为默认 /opt 目录的问题
This commit is contained in:
fit2cloudrd 2024-06-11 14:46:09 +08:00 committed by GitHub
commit 55e1dd4405
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
installer/install.sh
View File

@ -33,6 +33,7 @@ function check_and_prepare_env_params() {
if [ -f /usr/bin/dectl ]; then if [ -f /usr/bin/dectl ]; then
# 获取已安装的 DataEase 的运行目录 # 获取已安装的 DataEase 的运行目录
DE_BASE=$(grep "^DE_BASE=" /usr/bin/dectl | cut -d'=' -f2) 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 sed -i -e "s#DE_BASE=.*#DE_BASE=${DE_BASE}#g" dectl
\cp dectl /usr/local/bin && chmod +x /usr/local/bin/dectl \cp dectl /usr/local/bin && chmod +x /usr/local/bin/dectl
@ -54,6 +55,10 @@ function check_and_prepare_env_params() {
set -a set -a
source ${CURRENT_DIR}/install.conf 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 if [[ -d $DE_BASE ]] && [[ -f $DE_BASE/dataease2.0/.env ]]; then
source $DE_BASE/dataease2.0/.env source $DE_BASE/dataease2.0/.env
INSTALL_TYPE='upgrade' INSTALL_TYPE='upgrade'
@ -61,7 +66,7 @@ function check_and_prepare_env_params() {
conf_install_mode=$(prop $CURRENT_DIR/install.conf DE_INSTALL_MODE) conf_install_mode=$(prop $CURRENT_DIR/install.conf DE_INSTALL_MODE)
if [[ $DE_INSTALL_MODE == 'community' ]] && [[ $conf_install_mode == 'enterprise' ]];then if [[ $DE_INSTALL_MODE == 'community' ]] && [[ $conf_install_mode == 'enterprise' ]];then
DE_INSTALL_MODE=$conf_install_mode DE_INSTALL_MODE=$conf_install_mode
export DE_INSTALL_MODE export DE_INSTALL_MODE=$conf_install_mode
fi fi
log_content "升级安装" log_content "升级安装"
else else