bugfix - changed shell script interpreter to env bash

[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 4a528d8..e5a09df 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.
@@ -57,10 +56,10 @@ else
     sed -i "s|password:.*|password: $JDBC_PASSWORD|" "$main_path/conf/engine-d.yml"
 fi
 
-export SERVICE_IP=`hostname -i`
+export SERVICE_IP=`hostname -i | awk '{print $1}'`
 echo SERVICE_IP=${SERVICE_IP}
 
-if [ ! -z ${TESTING} -a ${TESTING} = 1 ]; then
+if [ ! -z ${TESTING} ] && [ ${TESTING} = 1 ]; then
     if [ ! -z ${HOST_IP} ]; then
         export HOSTNAME=${HOST_IP}:9102
     else
@@ -69,7 +68,7 @@ if [ ! -z ${TESTING} -a ${TESTING} = 1 ]; then
 fi
 
 export DB_PORT=5432
-if [ ! -z ${URL_JDBC} -a `expr index $URL_JDBC :` != 0 ]; then
+if [ ! -z ${URL_JDBC} ] && [ `expr index $URL_JDBC :` != 0 ]; then
     export DB_PORT="${URL_JDBC##*:}"
 fi
 echo DB_PORT=$DB_PORT
@@ -81,11 +80,20 @@ echo ENABLE_ENCRYPT=$ENABLE_ENCRYPT
 
 KEY_PATH="/opt/onap/conf/holmes.keystore"
 KEY_PASSWORD="holmes"
+
+if [ -f "/opt/app/osaaf/local/org.onap.holmes-engine-mgmt.p12" ]; then
+    KEY_PATH="/opt/app/osaaf/local/org.onap.holmes-engine-mgmt.p12"
+    KEY_PASSWORD=`head -n1 "/opt/app/osaaf/local/mycreds.prop" | cut -d= -f2`
+fi
+
+echo "KEY_PATH=$KEY_PATH"
+echo "KEY_PASS=$KEY_PASSWORD"
+
 #HTTPS Configurations
 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"