1.Automated installation enhancements.

close #79
WeBankFinTech · Jan 13, 2020 · 42621e1 · 42621e1
1 parent 4e35305
commit 42621e1
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/bin/start-all.sh b/bin/start-all.sh
@@ -23,10 +23,12 @@ echo ${info}
 source /etc/profile
 source ~/.bash_profile
 
-workDir=`dirname "${BASH_SOURCE-$0}"`
-workDir=`cd "$workDir"; pwd`
+shellDir=`dirname $0`
+
+workDir=`cd ${shellDir}/..;pwd`
+
+CONF_DIR="${workDir}"/conf
 
-CONF_DIR="${workDir}"/../conf
 export LINKIS_DSS_CONF_FILE=${LINKIS_DSS_CONF_FILE:-"${CONF_DIR}/config.sh"}
 export DISTRIBUTION=${DISTRIBUTION:-"${CONF_DIR}/config.sh"}
 source $LINKIS_DSS_CONF_FILE
@@ -151,7 +153,7 @@ if ! executeCMD $SERVER_IP "test -e ${DSS_INSTALL_HOME}/${SERVER_NAME}"; then
   return
 fi
 
-sh $workDir/checkServices.sh $SERVER_NAME $SERVER_IP $SERVER_PORT
+sh $workDir/bin/checkServices.sh $SERVER_NAME $SERVER_IP $SERVER_PORT
 isSuccess "start $SERVER_NAME "
 sleep 3
 echo "<-------------------------------->"