From: tang peng <tang.peng5@zte.com.cn>
Date: Thu, 2 Nov 2017 07:04:23 +0000 (+0000)
Subject: Merge "Correct the Syntax Error in the Scripts"
X-Git-Tag: v1.0.0~12
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=df8d4c85c5c6b47442b041bcf218f1440193d79d;hp=85ebf13c86536bfbc7873ed32468c1667efd0f86;p=holmes%2Frule-management.git

Merge "Correct the Syntax Error in the Scripts"
---

diff --git a/rulemgt-standalone/src/main/assembly/bin/initDB.sh b/rulemgt-standalone/src/main/assembly/bin/initDB.sh
index 19a2297..60b1f77 100644
--- a/rulemgt-standalone/src/main/assembly/bin/initDB.sh
+++ b/rulemgt-standalone/src/main/assembly/bin/initDB.sh
@@ -26,10 +26,10 @@ echo "start init holmes rulemgt db"
 main_path=$HOME/..
 cat $main_path/dbscripts/postgresql/onap-holmes_rulemgt-createobj.sql
 echo "dbname=$dbname"
-echo "user="$user
-echo "password="$password
-echo "port="$port
-echo "host="$host
+echo "user=$user"
+echo "password=$password"
+echo "port=$port"
+echo "host=$host"
 export PGPASSWORD=$password
 psql -U $user -p $port -h $host -f $main_path/dbscripts/postgresql/onap-holmes_rulemgt-createobj.sql
 psql -U $user -p $port -h $host -d $dbname --command 'select * from aplus_rule;'
@@ -42,4 +42,3 @@ if [ $sql_result != 0 ] ; then
 fi
 echo "init rulemgt success!"
 exit 0
-
diff --git a/rulemgt-standalone/src/main/assembly/bin/run.sh b/rulemgt-standalone/src/main/assembly/bin/run.sh
index 6b3b42d..fc1d63f 100644
--- a/rulemgt-standalone/src/main/assembly/bin/run.sh
+++ b/rulemgt-standalone/src/main/assembly/bin/run.sh
@@ -67,9 +67,9 @@ fi
 export DB_PORT=5432
 if [ ! -z ${URL_JDBC} ] && [ `expr index $URL_JDBC :` != 0 ]; then
     export DB_PORT="${URL_JDBC##*:}"
-if
+fi
+echo DB_PORT=$DB_PORT
 
 ./bin/initDB.sh $JDBC_USERNAME $JDBC_PASSWORD $DB_NAME $DB_PORT "${URL_JDBC%:*}"
 
 "$JAVA" $JAVA_OPTS -classpath "$class_path" org.onap.holmes.rulemgt.RuleActiveApp server "$main_path/conf/rulemgt.yml"
-