X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=engine-d-standalone%2Fsrc%2Fmain%2Fassembly%2Fbin%2Frun.sh;h=e5a09dfb4c9f67611e10d429bd3da4ed2b3c5548;hb=4640bd9237d68024c15f54d5884663eabb9f2fc0;hp=83b5275e1ea078230572cca16b7de7f1a419cfa0;hpb=f422d8f40e37d532bfbc152346e9c6c3b9fa9969;p=holmes%2Fengine-management.git diff --git a/engine-d-standalone/src/main/assembly/bin/run.sh b/engine-d-standalone/src/main/assembly/bin/run.sh index 83b5275..e5a09df 100644 --- 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,7 +56,7 @@ 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} ] && [ ${TESTING} = 1 ]; then @@ -94,7 +93,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"