This is an automated email from the ASF dual-hosted git repository. chanjarster pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-toolkit.git
commit b5726fb0195e7e2ee23c5f6cf82928782a8d2016 Author: kakulisen <18813972...@163.com> AuthorDate: Fri Dec 13 11:58:03 2019 +0800 fix bug of script in Mac Signed-off-by: kakulisen <18813972...@163.com> --- cli/scripts/cli.sh | 15 ++++++++++++++- .../org/apache/servicecomb/toolkit/cli/ToolkitMain.java | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/cli/scripts/cli.sh b/cli/scripts/cli.sh index 9360bba..81752d1 100755 --- a/cli/scripts/cli.sh +++ b/cli/scripts/cli.sh @@ -24,7 +24,20 @@ if [ -z "$JAVA_HOME" -o ! -f "$JAVA_HOME/bin/java" ]; then exit 1 fi -shellDir=$(dirname $(readlink -f "$0")) +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + +shellDir=`dirname "$PRG"` # check if jar file exist jarFile=$(find ${shellDir} -name "cli-*.jar" | head -n 1) diff --git a/cli/src/main/java/org/apache/servicecomb/toolkit/cli/ToolkitMain.java b/cli/src/main/java/org/apache/servicecomb/toolkit/cli/ToolkitMain.java index 8b637e7..ac3ac01 100755 --- a/cli/src/main/java/org/apache/servicecomb/toolkit/cli/ToolkitMain.java +++ b/cli/src/main/java/org/apache/servicecomb/toolkit/cli/ToolkitMain.java @@ -33,7 +33,7 @@ public class ToolkitMain { initialProjectVersion(); - Cli.CliBuilder<Runnable> builder = Cli.<Runnable>builder("java -jar toolkit-cli-" + projectVersion + ".jar"); + Cli.CliBuilder<Runnable> builder = Cli.<Runnable>builder("cli.sh"); builder.withDescription("Microservice development toolkit(version " + projectVersion + "). "); builder.withDefaultCommand(Help.class);