From: Fiachra Corcoran Date: Wed, 4 May 2022 13:58:41 +0000 (+0000) Subject: Merge "[COMMON] Fix sourced script with arguments bashism" X-Git-Tag: 10.0.0~18 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=44e6195ed3efb07ff8faeb10027aa91e53d8738f;hp=63e6a06f1e90af67e44b3194459ce8d4d3f853fb;p=oom.git Merge "[COMMON] Fix sourced script with arguments bashism" --- diff --git a/kubernetes/uui/components/uui-server/resources/entrypoint/run.sh b/kubernetes/uui/components/uui-server/resources/entrypoint/run.sh index f96dd74bd3..283d55b741 100644 --- a/kubernetes/uui/components/uui-server/resources/entrypoint/run.sh +++ b/kubernetes/uui/components/uui-server/resources/entrypoint/run.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh {{/* # # Copyright 2016-2017 ZTE Corporation. @@ -28,7 +28,7 @@ sleep 10 echo "usecase-ui database init script start..." dbScript="$main_path/resources/bin/initDB.sh" -source $dbScript 127.0.0.1 5432 postgres uui +$dbScript 127.0.0.1 5432 postgres uui echo "usecase-ui database init script finished normally..." JAVA_PATH="$JAVA_HOME/bin/java" @@ -40,4 +40,4 @@ jar_path="$main_path/usecase-ui-server.jar" echo @jar_path@ $jar_path echo "Starting usecase-ui-server..." -$JAVA_PATH $JAVA_OPTS -classpath $jar_path -jar $jar_path $SPRING_OPTS \ No newline at end of file +$JAVA_PATH $JAVA_OPTS -classpath $jar_path -jar $jar_path $SPRING_OPTS