From 1615dfe94491320668efa40dc752b2f873001fc7 Mon Sep 17 00:00:00 2001
From: reganhexx <57792210+ReganHe93@users.noreply.github.com>
Date: Thu, 26 Aug 2021 17:45:38 +0800
Subject: [PATCH] =?UTF-8?q?shell=E5=8F=98=E9=87=8F=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E5=BA=94=E8=AF=A5=E5=8A=A0$=E7=AC=A6=E5=8F=B7=20(#3890)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* shell变量读取应该加$符号

* shell变量读取应该加

Co-authored-by: Jared Tan <jian.tan@daocloud.io>
---
 CHANGES.md                                       | 2 ++
 apollo-adminservice/src/main/scripts/startup.sh  | 2 +-
 apollo-configservice/src/main/scripts/startup.sh | 2 +-
 apollo-portal/src/main/scripts/startup.sh        | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index a29c827d305..68792301eea 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,7 +5,9 @@ Release Notes.
 Apollo 1.10.0
 
 ------------------
+
 * [Bump version to 1.10.0](https://github.com/ctripcorp/apollo/pull/3917)
+* [Fix issue that the $ symbol is not used when reading shell variables](https://github.com/ctripcorp/apollo/pull/3890)
 
 ------------------
 All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/8?closed=1)
diff --git a/apollo-adminservice/src/main/scripts/startup.sh b/apollo-adminservice/src/main/scripts/startup.sh
index 85146c4c42a..20c40374ee1 100644
--- a/apollo-adminservice/src/main/scripts/startup.sh
+++ b/apollo-adminservice/src/main/scripts/startup.sh
@@ -120,7 +120,7 @@ do
     fi
 done
 
-if [[ ! -f PATH_TO_JAR && -d current ]]; then
+if [[ ! -f $PATH_TO_JAR && -d current ]]; then
     cd current
     for i in `ls $SERVICE_NAME-*.jar 2>/dev/null`
     do
diff --git a/apollo-configservice/src/main/scripts/startup.sh b/apollo-configservice/src/main/scripts/startup.sh
index 26854fd593d..46f3eb2b7f6 100644
--- a/apollo-configservice/src/main/scripts/startup.sh
+++ b/apollo-configservice/src/main/scripts/startup.sh
@@ -120,7 +120,7 @@ do
     fi
 done
 
-if [[ ! -f PATH_TO_JAR && -d current ]]; then
+if [[ ! -f $PATH_TO_JAR && -d current ]]; then
     cd current
     for i in `ls $SERVICE_NAME-*.jar 2>/dev/null`
     do
diff --git a/apollo-portal/src/main/scripts/startup.sh b/apollo-portal/src/main/scripts/startup.sh
index 2534bb8ca73..af04f2afd5b 100755
--- a/apollo-portal/src/main/scripts/startup.sh
+++ b/apollo-portal/src/main/scripts/startup.sh
@@ -120,7 +120,7 @@ do
     fi
 done
 
-if [[ ! -f PATH_TO_JAR && -d current ]]; then
+if [[ ! -f $PATH_TO_JAR && -d current ]]; then
     cd current
     for i in `ls $SERVICE_NAME-*.jar 2>/dev/null`
     do