From 4a70c79e2009936266ecf96a11e1eb47bd352cf0 Mon Sep 17 00:00:00 2001 From: herengui Date: Fri, 13 Aug 2021 08:56:26 +0800 Subject: [PATCH 1/2] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apollo-adminservice/src/main/scripts/startup.sh | 2 +- apollo-configservice/src/main/scripts/startup.sh | 2 +- apollo-portal/src/main/scripts/startup.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 From 5ea60ec206392bd6626e81d6b80a49e0d11b4dc3 Mon Sep 17 00:00:00 2001 From: herengui Date: Mon, 16 Aug 2021 10:29:58 +0800 Subject: [PATCH 2/2] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 04f0ac9e931..f33c41f0e08 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -77,6 +77,7 @@ Apollo 1.9.0 * [polish log](https://github.com/ctripcorp/apollo/pull/3882) * [add history query](https://github.com/ctripcorp/apollo/pull/3878) * [fix history query](https://github.com/ctripcorp/apollo/pull/3894) +* [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/6?closed=1)