Merge pull request #9 from wangwg1/myfeature

修改 run_server.sh run_client.sh run_concurrent_client.sh 适配 mingw/cygwin
wenweihu86 · Jul 25, 2018 · 8722482 · 8722482
2 parents 653e015 + 5d84a8e
commit 8722482
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 8 deletions.
diff --git a/raft-java-example/src/main/assembly/bin/run_client.sh b/raft-java-example/src/main/assembly/bin/run_client.sh
@@ -1,10 +1,21 @@
 #!/bin/bash
-
 if [ $# -lt 2 ]; then
  echo "Usage: ./run_server.sh CLUSTER KEY [VALUE]"
  exit
 fi
 
+#begin adapt cygwin/mingw 
+UNAME_STR=$(uname -a)
+CURRENT_SYS=${var:0:5}
+var=$(uname -a)
+CURRENT_SYS=${var:0:5}
+if [ $CURRENT_SYS == "MINGW" ]; then
+ echo "--current system is mingw--"
+elif [ $CURRENT_SYS == "CYGWI" ]; then
+ echo "--current system is cygwin--"
+fi
+#end adapt cygwin/mingw
+
 JMX_PORT=18101
 GC_LOG=./logs/gc.log
 #jvm config
@@ -26,10 +37,14 @@ JAVA_MEM_OPTS=" -server -Xms2g -Xmx2g -Xmn600m -XX:PermSize=128m \
 JAVA_GC_OPTS=" -verbose:gc -Xloggc:$GC_LOG \
 -XX:+PrintGCDetails -XX:+PrintGCDateStamps "
 
-JAVA_CP=" -cp conf:lib/* "
+if [ $CURRENT_SYS == "MINGW" ] || [ $CURRENT_SYS == "CYGWI" ]; then
+ JAVA_CP=" -cp conf;lib/* "
+else
+ JAVA_CP=" -cp conf:lib/* "
+fi
 
 JAVA_OPTS=" $JAVA_BASE_OPTS $JAVA_MEM_OPTS $JAVA_JMX_OPTS $JAVA_GC_OPTS $JAVA_CP"
 
 RUNJAVA="$JAVA_HOME/bin/java"
 MAIN_CLASS=com.github.wenweihu86.raft.example.client.ClientMain
-$RUNJAVA $JAVA_CP $MAIN_CLASS "$@"
+$RUNJAVA $JAVA_CP $MAIN_CLASS "$@"
diff --git a/raft-java-example/src/main/assembly/bin/run_concurrent_client.sh b/raft-java-example/src/main/assembly/bin/run_concurrent_client.sh
@@ -1,11 +1,22 @@
 #!/bin/bash
-
 if [ $# -ne 1 ]; then
  echo "Usage: ./run_concurrent_client.sh THREAD_NUM"
  exit
 fi
 THREAD_NUM=$1
 
+#begin adapt cygwin/mingw 
+UNAME_STR=$(uname -a)
+CURRENT_SYS=${var:0:5}
+var=$(uname -a)
+CURRENT_SYS=${var:0:5}
+if [ $CURRENT_SYS == "MINGW" ]; then
+ echo "--current system is mingw--"
+elif [ $CURRENT_SYS == "CYGWI" ]; then
+ echo "--current system is cygwin--"
+fi
+#end adapt cygwin/mingw
+
 JMX_PORT=18101
 GC_LOG=./logs/gc.log
 #jvm config
@@ -27,10 +38,14 @@ JAVA_MEM_OPTS=" -server -Xms2g -Xmx2g -Xmn600m -XX:PermSize=128m \
 JAVA_GC_OPTS=" -verbose:gc -Xloggc:$GC_LOG \
 -XX:+PrintGCDetails -XX:+PrintGCDateStamps "
 
-JAVA_CP=" -cp conf:lib/* "
+if [ $CURRENT_SYS == "MINGW" ] || [ $CURRENT_SYS == "CYGWI" ]; then
+ JAVA_CP=" -cp conf;lib/* "
+else
+ JAVA_CP=" -cp conf:lib/* "
+fi
 
 JAVA_OPTS=" $JAVA_BASE_OPTS $JAVA_MEM_OPTS $JAVA_JMX_OPTS $JAVA_GC_OPTS $JAVA_CP"
 
 RUNJAVA="$JAVA_HOME/bin/java"
 MAIN_CLASS=com.github.wenweihu86.raft.example.client.ConcurrentClientMain
-$RUNJAVA $JAVA_CP $MAIN_CLASS $THREAD_NUM
+$RUNJAVA $JAVA_CP $MAIN_CLASS $THREAD_NUM
diff --git a/raft-java-example/src/main/assembly/bin/run_server.sh b/raft-java-example/src/main/assembly/bin/run_server.sh
@@ -1,10 +1,21 @@
 #!/bin/bash
-
 if [ $# -ne 3 ]; then
  echo "Usage: ./run_server.sh DATA_PATH CLUSTER CURRENT_NODE"
  exit
 fi
 
+#begin adapt cygwin/mingw 
+UNAME_STR=$(uname -a)
+CURRENT_SYS=${var:0:5}
+var=$(uname -a)
+CURRENT_SYS=${var:0:5}
+if [ $CURRENT_SYS == "MINGW" ]; then
+ echo "--current system is mingw--"
+elif [ $CURRENT_SYS == "CYGWI" ]; then
+ echo "--current system is cygwin--"
+fi
+#end adapt cygwin/mingw
+
 DATA_PATH=$1
 CLUSTER=$2
 CURRENT_NODE=$3
@@ -30,7 +41,11 @@ JAVA_MEM_OPTS=" -server -Xms2g -Xmx2g -Xmn600m -XX:PermSize=128m \
 JAVA_GC_OPTS=" -verbose:gc -Xloggc:$GC_LOG \
 -XX:+PrintGCDetails -XX:+PrintGCDateStamps "
 
-JAVA_CP=" -cp conf:lib/* "
+if [ $CURRENT_SYS == "MINGW" ] || [ $CURRENT_SYS == "CYGWI" ]; then
+ JAVA_CP=" -cp conf;lib/* "
+else
+ JAVA_CP=" -cp conf:lib/* "
+fi
 
 JAVA_OPTS=" $JAVA_BASE_OPTS $JAVA_MEM_OPTS $JAVA_JMX_OPTS $JAVA_GC_OPTS $JAVA_CP"