From be41973103b407c67e5551d0aec501bed1eba9c4 Mon Sep 17 00:00:00 2001
From: Patrick <dreamlike.sky@foxmail.com>
Date: Sun, 8 Mar 2020 16:39:18 +0800
Subject: [PATCH] modify

---
 before_ut.bat | 20 ++++++++++++--------
 before_ut.sh  | 19 +++++++++++--------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/before_ut.bat b/before_ut.bat
index a6b0dff67..abe7fc250 100644
--- a/before_ut.bat
+++ b/before_ut.bat
@@ -14,20 +14,24 @@
 ::  See the License for the specific language governing permissions and
 ::  limitations under the License.
 
-set zkJar=zookeeper-3.4.9-fatjar.jar
-if not exist "remoting/zookeeper/zookeeper-4unittest/contrib/fatjar/%zkJar%" (
-   md remoting\zookeeper\zookeeper-4unittest\contrib\fatjar
-   curl -L https://github.com/dubbogo/resources/raw/master/zookeeper-4unitest/contrib/fatjar/%zkJar% -o remoting/zookeeper/zookeeper-4unittest/contrib/fatjar/%zkJar%
+set zkJarName="zookeeper-3.4.9-fatjar.jar"
+set remoteJarUrl="https://github.com/dubbogo/resources/raw/master/zookeeper-4unitest/contrib/fatjar/%zkJarName%"
+set zkJarPath="remoting/zookeeper/zookeeper-4unittest/contrib/fatjar"
+set zkJar="%zkJarPath%/%zkJarName%"
+
+if not exist "%zkJar%" (
+   md %zkJarPath%
+   curl -L %remoteJarUrl% -o %zkJar%
 )
 
 md config_center\zookeeper\zookeeper-4unittest\contrib\fatjar
-xcopy /f "remoting/zookeeper/zookeeper-4unittest/contrib/fatjar/%zkJar%" "config_center/zookeeper/zookeeper-4unittest/contrib/fatjar/"
+xcopy /f "%zkJar%" "config_center/zookeeper/zookeeper-4unittest/contrib/fatjar/"
 
 md registry\zookeeper\zookeeper-4unittest\contrib\fatjar
-xcopy /f "remoting/zookeeper/zookeeper-4unittest/contrib/fatjar/%zkJar%" "registry/zookeeper/zookeeper-4unittest/contrib/fatjar/"
+xcopy /f "%zkJar%" "registry/zookeeper/zookeeper-4unittest/contrib/fatjar/"
 
 md cluster\router\chain\zookeeper-4unittest\contrib\fatjar
-xcopy /f "remoting/zookeeper/zookeeper-4unittest/contrib/fatjar/%zkJar%" "cluster/router/chain/zookeeper-4unittest/contrib/fatjar/"
+xcopy /f "%zkJar%" "cluster/router/chain/zookeeper-4unittest/contrib/fatjar/"
 
 md cluster\router\condition\zookeeper-4unittest\contrib\fatjar
-xcopy /f "remoting/zookeeper/zookeeper-4unittest/contrib/fatjar/%zkJar%" "cluster/router/condition/zookeeper-4unittest/contrib/fatjar/"
\ No newline at end of file
+xcopy /f "%zkJar%" "cluster/router/condition/zookeeper-4unittest/contrib/fatjar/"
\ No newline at end of file
diff --git a/before_ut.sh b/before_ut.sh
index 3a958e0dd..7ee92e57a 100755
--- a/before_ut.sh
+++ b/before_ut.sh
@@ -14,21 +14,24 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-zkJar="zookeeper-3.4.9-fatjar.jar"
+zkJarName="zookeeper-3.4.9-fatjar.jar"
+remoteJarUrl="https://github.com/dubbogo/resources/raw/master/zookeeper-4unitest/contrib/fatjar/${zkJarName}"
+zkJarPath="remoting/zookeeper/zookeeper-4unittest/contrib/fatjar"
+zkJar="${zkJarPath}/${zkJarName}"
 
-if [ ! -f "remoting/zookeeper/zookeeper-4unittest/contrib/fatjar/${zkJar}" ]; then
-    mkdir -p remoting/zookeeper/zookeeper-4unittest/contrib/fatjar
-    wget -P "remoting/zookeeper/zookeeper-4unittest/contrib/fatjar" https://github.com/dubbogo/resources/raw/master/zookeeper-4unitest/contrib/fatjar${zkJar}
+if [ ! -f "${zkJar}" ]; then
+    mkdir -p ${zkJarPath}
+    wget -P "${zkJarPath}" ${remoteJarUrl}
 fi
 
 mkdir -p config_center/zookeeper/zookeeper-4unittest/contrib/fatjar
-cp remoting/zookeeper/zookeeper-4unittest/contrib/fatjar/${zkJar} config_center/zookeeper/zookeeper-4unittest/contrib/fatjar/
+cp ${zkJar} config_center/zookeeper/zookeeper-4unittest/contrib/fatjar/
 
 mkdir -p registry/zookeeper/zookeeper-4unittest/contrib/fatjar
-cp remoting/zookeeper/zookeeper-4unittest/contrib/fatjar/${zkJar} registry/zookeeper/zookeeper-4unittest/contrib/fatjar/
+cp ${zkJar} registry/zookeeper/zookeeper-4unittest/contrib/fatjar/
 
 mkdir -p cluster/router/chain/zookeeper-4unittest/contrib/fatjar
-cp remoting/zookeeper/zookeeper-4unittest/contrib/fatjar/${zkJar} cluster/router/chain/zookeeper-4unittest/contrib/fatjar
+cp ${zkJar} cluster/router/chain/zookeeper-4unittest/contrib/fatjar
 
 mkdir -p cluster/router/condition/zookeeper-4unittest/contrib/fatjar
-cp remoting/zookeeper/zookeeper-4unittest/contrib/fatjar/${zkJar} cluster/router/condition/zookeeper-4unittest/contrib/fatjar
\ No newline at end of file
+cp ${zkJar} cluster/router/condition/zookeeper-4unittest/contrib/fatjar
\ No newline at end of file
-- 
GitLab