From 9a6380da83c1acc73812c36961b43bb6289d9f8b Mon Sep 17 00:00:00 2001
From: Taka Cho <takamune.cho@att.com>
Date: Mon, 30 Nov 2020 14:50:59 -0500
Subject: move all bash to ash shell scripts - dist

bash scripts convert to ash

Issue-ID: POLICY-2847
Change-Id: Iee0aacfdf01425cb2b6e6347672ebdd82ec205e1
Signed-off-by: Taka Cho <takamune.cho@att.com>
---
 .../policy-distribution-docker/src/main/docker/Dockerfile    |  2 +-
 .../src/main/docker/policy-dist.sh                           | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'packages/policy-distribution-docker/src/main')

diff --git a/packages/policy-distribution-docker/src/main/docker/Dockerfile b/packages/policy-distribution-docker/src/main/docker/Dockerfile
index 6b8ff757..e015e29b 100644
--- a/packages/policy-distribution-docker/src/main/docker/Dockerfile
+++ b/packages/policy-distribution-docker/src/main/docker/Dockerfile
@@ -42,4 +42,4 @@ RUN chown -R policy:policy * && chmod 755 bin/*.sh
 
 USER policy
 WORKDIR $POLICY_HOME/bin
-ENTRYPOINT [ "bash", "./policy-dist.sh" ]
+ENTRYPOINT [ "./policy-dist.sh" ]
diff --git a/packages/policy-distribution-docker/src/main/docker/policy-dist.sh b/packages/policy-distribution-docker/src/main/docker/policy-dist.sh
index 73a869bb..5b1536e7 100644
--- a/packages/policy-distribution-docker/src/main/docker/policy-dist.sh
+++ b/packages/policy-distribution-docker/src/main/docker/policy-dist.sh
@@ -1,8 +1,9 @@
-#!/bin/bash -x
+#!/usr/bin/env ash
 #
 # ============LICENSE_START=======================================================
 #  Copyright (C) 2018 Ericsson. All rights reserved.
 #  Modifications Copyright (C) 2019-2020 Nordix Foundation.
+#  Modifications Copyright (C) 2020 AT&T.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,22 +33,21 @@ else
     CONFIG_FILE=${CONFIG_FILE}
 fi
 
-if [ -z "$CONFIG_FILE" ]
-  then
+if [ -z "$CONFIG_FILE" ]; then
     CONFIG_FILE="${POLICY_HOME}/etc/defaultConfig.json"
 fi
 
-if [[ -f "${POLICY_HOME}"/etc/mounted/policy-truststore ]]; then
+if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then
     echo "overriding policy-truststore"
     cp -f "${POLICY_HOME}"/etc/mounted/policy-truststore "${TRUSTSTORE}"
 fi
 
-if [[ -f "${POLICY_HOME}"/etc/mounted/policy-keystore ]]; then
+if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then
     echo "overriding policy-keystore"
     cp -f "${POLICY_HOME}"/etc/mounted/policy-keystore "${KEYSTORE}"
 fi
 
-if [[ -f "${POLICY_HOME}"/etc/mounted/logback.xml ]]; then
+if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then
     echo "overriding logback.xml"
     cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/
 fi
-- 
cgit 1.2.3-korg