From 42621e18346a3605a9bb42be9c06af05b553c189 Mon Sep 17 00:00:00 2001 From: chaogefeng <673120261@163.com> Date: Fri, 10 Jan 2020 21:00:50 +0800 Subject: [PATCH] 1.Automated installation enhancements. close #79 --- bin/start-all.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/start-all.sh b/bin/start-all.sh index 14016d0200..4c4cd173f1 100644 --- 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 "<-------------------------------->"