Fixed some bugs

[holmes/engine-management.git] / engine-d-standalone / src / main / assembly / bin / run.sh

diff --git a/engine-d-standalone/src/main/assembly/bin/run.sh b/engine-d-standalone/src/main/assembly/bin/run.sh
index f565e2e..55f58dd 100644 (file)
--- a/engine-d-standalone/src/main/assembly/bin/run.sh
+++ b/engine-d-standalone/src/main/assembly/bin/run.sh
@@ -1,7 +1,6 @@
-#!/bin/sh
-
+#!/usr/bin/env bash
 #
-# Copyright 2017-2020 ZTE Corporation.
+# Copyright 2017-2021 ZTE Corporation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -60,12 +59,10 @@ fi
 export SERVICE_IP=`hostname -i | awk '{print $1}'`
 echo SERVICE_IP=${SERVICE_IP}
 
-if [ ! -z ${TESTING} ] && [ ${TESTING} = 1 ]; then
-    if [ ! -z ${HOST_IP} ]; then
-        export HOSTNAME=${HOST_IP}:9102
-    else
-        export HOSTNAME=${SERVICE_IP}:9102
-    fi
+if [ ! -z ${HOST_IP} ]; then
+    export HOSTNAME=${HOST_IP}:9102
+else
+    export HOSTNAME=${SERVICE_IP}:9102
 fi
 
 export DB_PORT=5432
@@ -94,7 +91,7 @@ echo "KEY_PASS=$KEY_PASSWORD"
 sed -i "s|keyStorePath:.*|keyStorePath: $KEY_PATH|" "$main_path/conf/engine-d.yml"
 sed -i "s|keyStorePassword:.*|keyStorePassword: $KEY_PASSWORD|" "$main_path/conf/engine-d.yml"
 
-if [ ${ENABLE_ENCRYPT} = true ]; then
+if [ "${ENABLE_ENCRYPT}"x = "true"x ]; then
     sed -i "s|type:\s*https\?$|type: https|" "$main_path/conf/engine-d.yml"
     sed -i "s|#\?keyStorePath|keyStorePath|" "$main_path/conf/engine-d.yml"
     sed -i "s|#\?keyStorePassword|keyStorePassword|" "$main_path/conf/engine-d.yml"