Merge pull request ffay#5 from tianyl1984/master

classpath问题导致启动找不到配置文件
xiaostar518 · Sep 12, 2017 · 70e3c24 · 70e3c24
2 parents aea4b42 + cd68dd9
commit 70e3c24
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/proxy-client/src/main/resources/startup.sh b/proxy-client/src/main/resources/startup.sh
@@ -21,7 +21,7 @@ STDOUT_FILE=$LOGS_DIR/stdout.log
 CLOG_FILE=$LOGS_DIR/gc.log
 
 LIB_DIR=$DEPLOY_DIR/lib
-LIB_JARS=`ls $LIB_DIR|grep .jar|awk '{print "'$LIB_DIR'/"$0}'|tr "\n" ":"`
+LIB_JARS=`ls $LIB_DIR|grep .jar|awk '{print "'$LIB_DIR'/"$0}'| xargs | sed "s/ /:/g"`
 
 JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true "
 JAVA_DEBUG_OPTS=""

diff --git a/proxy-server/src/main/resources/startup.sh b/proxy-server/src/main/resources/startup.sh
@@ -21,7 +21,7 @@ STDOUT_FILE=$LOGS_DIR/stdout.log
 CLOG_FILE=$LOGS_DIR/gc.log
 
 LIB_DIR=$DEPLOY_DIR/lib
-LIB_JARS=`ls $LIB_DIR|grep .jar|awk '{print "'$LIB_DIR'/"$0}'|tr "\n" ":"`
+LIB_JARS=`ls $LIB_DIR|grep .jar|awk '{print "'$LIB_DIR'/"$0}'| xargs | sed "s/ /:/g"`
 
 JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true "
 JAVA_DEBUG_OPTS=""