From: Jack Lucas <jflos@sonoris.net>
Date: Tue, 3 May 2022 14:01:36 +0000 (+0000)
Subject: Merge "[COMMON] Fix 'trap RETURN' and $BASHPID bashisms"
X-Git-Tag: 10.0.0~23
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=6354ac840245587ae6a587f0978952d37872da41;hp=9a62578638e21ecc0c12be240af6365b3e84a416

Merge "[COMMON] Fix 'trap RETURN' and $BASHPID bashisms"
---

diff --git a/kubernetes/sdnc/components/sdnc-prom/resources/bin/ensureSdncActive.sh b/kubernetes/sdnc/components/sdnc-prom/resources/bin/ensureSdncActive.sh
index 099103ca79..d92a1049e3 100755
--- a/kubernetes/sdnc/components/sdnc-prom/resources/bin/ensureSdncActive.sh
+++ b/kubernetes/sdnc/components/sdnc-prom/resources/bin/ensureSdncActive.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 {{/*
 # Copyright © 2018 Amdocs
@@ -33,8 +33,8 @@ failover(){
     debugLog "Currently running sdnc and dns failover"
     return
   fi
-  trap "rm -f ${lockFile}" INT TERM RETURN
-  echo $BASHPID > ${lockFile}
+  trap "rm -f ${lockFile}" INT TERM EXIT
+  echo $$ > ${lockFile}
 
   # perform takeover
   debugLog "Started executing sdnc.failover for $SITE_NAME"