From 2cbbf0a516192e1ec0ce3078360ba923fd5801f6 Mon Sep 17 00:00:00 2001 From: imhao183 Date: Wed, 3 Mar 2021 18:24:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=AF=E5=8A=A8=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- distribution/src/main/scripts/wildfirechat.bat | 3 +-- distribution/src/main/scripts/wildfirechat.sh | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/distribution/src/main/scripts/wildfirechat.bat b/distribution/src/main/scripts/wildfirechat.bat index 0c17b582..1aadc903 100644 --- a/distribution/src/main/scripts/wildfirechat.bat +++ b/distribution/src/main/scripts/wildfirechat.bat @@ -1,12 +1,11 @@ @ECHO OFF set "CURRENT_DIR=%cd%" -if not "%WILDFIRECHAT_HOME%" == "" goto gotHome set "WILDFIRECHAT_HOME=%CURRENT_DIR%" if exist "%WILDFIRECHAT_HOME%\bin\wildfirechat.bat" goto okHome cd .. set "WILDFIRECHAT_HOME=%cd%" -cd "%CURRENT_DIR%" +set "CURRENT_DIR=%cd%" :gotHome if exist "%WILDFIRECHAT_HOME%\bin\wildfirechat.bat" goto okHome echo The WILDFIRECHAT_HOME environment variable is not defined correctly diff --git a/distribution/src/main/scripts/wildfirechat.sh b/distribution/src/main/scripts/wildfirechat.sh index 255da433..1cfb33aa 100755 --- a/distribution/src/main/scripts/wildfirechat.sh +++ b/distribution/src/main/scripts/wildfirechat.sh @@ -11,11 +11,14 @@ while [ -h "$PRG" ]; do if expr "$link" : '/.*' > /dev/null; then PRG="$link" else - PRG=`dirname "$PRG"`/"$link" + PRGDIR=`dirname "$PRG"` + cd $PRGDIR + PRG="`pwd`"/"$link" fi done PRGDIR=`dirname "$PRG"` +cd $PRGDIR cd .. WILDFIRECHAT_HOME=`pwd`