[shardingsphere] branch master updated: fix class path for proxy (#9333)

[xiaoyu]

This is an automated email from the ASF dual-hosted git repository.

xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new c913edb  fix class path for proxy (#9333)
c913edb is described below

commit c913edb2ed25c7d88bd9ffb92f583dbd0a34bc47
Author: Zhang Yonglun <zhangyong...@apache.org>
AuthorDate: Fri Feb 5 10:36:47 2021 +0800

    fix class path for proxy (#9333)
---
 .../shardingsphere-proxy-distribution/src/main/resources/bin/start.sh   | 2 +-
 .../src/test/assembly/bin/start.sh                                      | 2 +-
 .../src/test/assembly/bin/start.sh                                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/resources/bin/start.sh
 
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/resources/bin/start.sh
index 8b4e266..7483e15 100644
--- 
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/resources/bin/start.sh
+++ 
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/resources/bin/start.sh
@@ -54,7 +54,7 @@ echo "Starting the $SERVER_NAME ..."
 if [ $# == 1 ]; then
     MAIN_CLASS=${MAIN_CLASS}" "$1
     echo "The port is $1"
-    set CLASS_PATH=../conf;%CLASS_PATH%
+    CLASS_PATH=${DEPLOY_DIR}/conf:${CLASS_PATH}
 fi
 
 if [ $# == 2 ]; then
diff --git 
a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/src/test/assembly/bin/start.sh
 
b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/src/test/assembly/bin/start.sh
index 45fb575..8545934 100644
--- 
a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/src/test/assembly/bin/start.sh
+++ 
b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/src/test/assembly/bin/start.sh
@@ -54,7 +54,7 @@ echo "Starting the $SERVER_NAME ..."
 if [ $# == 1 ]; then
     MAIN_CLASS=${MAIN_CLASS}" "$1
     echo "The port is $1"
-    CLASS_PATH=../conf:${CLASS_PATH}
+    CLASS_PATH=${DEPLOY_DIR}/conf:${CLASS_PATH}
 fi
 
 if [ $# == 2 ]; then
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/assembly/bin/start.sh
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/assembly/bin/start.sh
index 67f2549..4a058ac 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/assembly/bin/start.sh
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/assembly/bin/start.sh
@@ -54,7 +54,7 @@ echo "Starting the $SERVER_NAME ..."
 if [ $# == 1 ]; then
     MAIN_CLASS=${MAIN_CLASS}" "$1
     echo "The port is $1"
-    CLASS_PATH=../conf:${CLASS_PATH}
+    CLASS_PATH=${DEPLOY_DIR}/conf:${CLASS_PATH}
 fi
 
 if [ $# == 2 ]; then