From b166cd8d4c91ad7eaff08525cbe2d8a26d713431 Mon Sep 17 00:00:00 2001 From: xuwei-fit2cloud Date: Tue, 12 Mar 2024 15:51:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20installer=20?= =?UTF-8?q?=E5=81=9C=E6=AD=A2=E6=9C=8D=E5=8A=A1=E7=9A=84=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- installer/dectl | 5 ++++- installer/install.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/installer/dectl b/installer/dectl index 3fd94546ad..f17e7df2b2 100644 --- a/installer/dectl +++ b/installer/dectl @@ -49,7 +49,10 @@ function usage() { } function _generate_compose_file_args() { if [[ $DE_INSTALL_MODE != "community" ]];then - compose_files="${compose_files} -f docker-compose-apisix.yml -f docker-compose-task.yml" + compose_files="${compose_files} -f docker-compose-apisix.yml" + if [[ -f $DE_RUNNING_BASE/docker-compose-task.yml ]];then + compose_files="${compose_files} -f docker-compose-task.yml" + fi fi } function _check_apisix_init() { diff --git a/installer/install.sh b/installer/install.sh index 49795034af..b8a3797ba1 100644 --- a/installer/install.sh +++ b/installer/install.sh @@ -23,7 +23,7 @@ if [ -f /usr/bin/dectl ]; then sed -i -e "s#DE_BASE=.*#DE_BASE=${DE_BASE}#g" dectl \cp dectl /usr/local/bin && chmod +x /usr/local/bin/dectl - if [[ ! -f /etc/systemd/system/dataease.service ]];then + if [[ -f /etc/systemd/system/dataease.service ]];then systemctl stop dataease else dectl stop