Merge pull request #5 from tianyl1984/master

classpath问题导致启动找不到配置文件
7 years ago · 70e3c242de
parent aea4b428c2 cd68dd9f83
commit 70e3c242de
2 changed files with 2 additions and 2 deletions
--- 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=""
--- 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=""