From f48db3f81a6ad765475fce21b23f7c3f8673beb7 Mon Sep 17 00:00:00 2001
From: Emor-nj <emor93@foxmail.com>
Date: Wed, 17 Jan 2024 17:16:29 +0800
Subject: [PATCH] uniformly modify all related scripts.

---
 bin/beeline              | 4 +++-
 bin/docker-image-tool.sh | 2 +-
 bin/kyuubi               | 4 +++-
 bin/kyuubi-admin         | 4 +++-
 bin/kyuubi-ctl           | 4 +++-
 bin/kyuubi-zk-cli        | 5 +++--
 bin/load-kyuubi-env.sh   | 5 +++--
 7 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/bin/beeline b/bin/beeline
index 2d5599961fc..a66354a3c80 100755
--- a/bin/beeline
+++ b/bin/beeline
@@ -19,7 +19,9 @@
 ## Kyuubi BeeLine Entrance
 CLASS="org.apache.hive.beeline.KyuubiBeeLine"
 
-export KYUUBI_HOME="${KYUUBI_HOME:-"$(cd "$(dirname "$0")"/.. || exit; pwd)"}"
+if [ -z "${KYUUBI_HOME}" ]; then
+  export KYUUBI_HOME="$(cd "`dirname "$0"`"/..; pwd)"
+fi
 
 . "${KYUUBI_HOME}/bin/load-kyuubi-env.sh" -s
 
diff --git a/bin/docker-image-tool.sh b/bin/docker-image-tool.sh
index 14d5fe7b09d..188d79e4f56 100755
--- a/bin/docker-image-tool.sh
+++ b/bin/docker-image-tool.sh
@@ -25,7 +25,7 @@ function error {
 }
 
 if [ -z "${KYUUBI_HOME}" ]; then
-  KYUUBI_HOME="$(cd "`dirname "$0"`"/..; pwd)"
+  export KYUUBI_HOME="$(cd "`dirname "$0"`"/..; pwd)"
 fi
 KYUUBI_IMAGE_NAME="kyuubi"
 
diff --git a/bin/kyuubi b/bin/kyuubi
index 9132aae39e8..d5f568a943e 100755
--- a/bin/kyuubi
+++ b/bin/kyuubi
@@ -62,7 +62,9 @@ function kyuubi_rotate_log() {
   fi
 }
 
-export KYUUBI_HOME="$(cd "$(dirname "$0")"/..; pwd)"
+if [ -z "${KYUUBI_HOME}" ]; then
+  export KYUUBI_HOME="$(cd "`dirname "$0"`"/..; pwd)"
+fi
 
 if [[ $1 == "start" ]] || [[ $1 == "run" ]]; then
   . "${KYUUBI_HOME}/bin/load-kyuubi-env.sh"
diff --git a/bin/kyuubi-admin b/bin/kyuubi-admin
index a1f176ec157..d47c0fb3a3b 100755
--- a/bin/kyuubi-admin
+++ b/bin/kyuubi-admin
@@ -19,7 +19,9 @@
 ## Kyuubi Admin Control Client Entrance
 CLASS="org.apache.kyuubi.ctl.cli.AdminControlCli"
 
-export KYUUBI_HOME="$(cd "$(dirname "$0")"/..; pwd)"
+if [ -z "${KYUUBI_HOME}" ]; then
+  export KYUUBI_HOME="$(cd "`dirname "$0"`"/..; pwd)"
+fi
 
 . "${KYUUBI_HOME}/bin/load-kyuubi-env.sh" -s
 
diff --git a/bin/kyuubi-ctl b/bin/kyuubi-ctl
index 16809c0754b..33b0c6f43f7 100755
--- a/bin/kyuubi-ctl
+++ b/bin/kyuubi-ctl
@@ -19,7 +19,9 @@
 ## Kyuubi Control Client Entrance
 CLASS="org.apache.kyuubi.ctl.cli.ControlCli"
 
-export KYUUBI_HOME="$(cd "$(dirname "$0")"/..; pwd)"
+if [ -z "${KYUUBI_HOME}" ]; then
+  export KYUUBI_HOME="$(cd "`dirname "$0"`"/..; pwd)"
+fi
 
 . "${KYUUBI_HOME}/bin/load-kyuubi-env.sh" -s
 
diff --git a/bin/kyuubi-zk-cli b/bin/kyuubi-zk-cli
index f503c3e5a5e..94102d4aba1 100755
--- a/bin/kyuubi-zk-cli
+++ b/bin/kyuubi-zk-cli
@@ -19,8 +19,9 @@
 ## Zookeeper Shell Client Entrance
 CLASS="org.apache.kyuubi.shaded.zookeeper.ZooKeeperMain"
 
-export KYUUBI_HOME="$(cd "$(dirname "$0")"/..; pwd)"
-
+if [ -z "${KYUUBI_HOME}" ]; then
+  export KYUUBI_HOME="$(cd "`dirname "$0"`"/..; pwd)"
+fi
 . "${KYUUBI_HOME}/bin/load-kyuubi-env.sh" -s
 
 if [[ -z ${JAVA_HOME} ]]; then
diff --git a/bin/load-kyuubi-env.sh b/bin/load-kyuubi-env.sh
index 4d6f72ddf3e..f44bcfed731 100755
--- a/bin/load-kyuubi-env.sh
+++ b/bin/load-kyuubi-env.sh
@@ -17,8 +17,9 @@
 #
 
 
-export KYUUBI_HOME="${KYUUBI_HOME:-"$(cd "$(dirname "$0")"/.. || exit; pwd)"}"
-
+if [ -z "${KYUUBI_HOME}" ]; then
+  export KYUUBI_HOME="$(cd "`dirname "$0"`"/..; pwd)"
+fi
 export KYUUBI_CONF_DIR="${KYUUBI_CONF_DIR:-"${KYUUBI_HOME}"/conf}"
 
 silent=0