From: Zhe Huang <zhehuang@research.att.com>
Date: Tue, 7 Apr 2020 20:50:52 +0000 (-0400)
Subject: Modify the verify script for LF build minions.
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=1c0c34ba9d178ca647b6642a7990b742ea4ccbb1;p=ric-plt%2Fric-dep.git

Modify the verify script for LF build minions.

Signed-off-by: Zhe Huang <zhehuang@research.att.com>
Change-Id: I51ce171145c90f3ba3fe43e009640651e3ae1307
---

diff --git a/bin/verify-ric-charts b/bin/verify-ric-charts
index 6cadf7c..7400185 100755
--- a/bin/verify-ric-charts
+++ b/bin/verify-ric-charts
@@ -34,7 +34,7 @@ if [[ "${2:-nope}" != "nope" ]]; then
     OVERRIDEYAML=$2
 fi
 
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+ROOT_DIR="$(pwd)"
 HELM_COMMAND=helm
 
 if ! $($HELM_COMMAND > /dev/null);then
@@ -52,10 +52,9 @@ fi
 git clone --single-branch --branch master "https://gerrit.o-ran-sc.org/r/it/dep" ./dep
 
 # Start Helm local repo if there isn't one
-HELM_PID=$(pgrep  "$HELM_COMMAND")
-if [ ! -z "$HELM_PID" ]; then
+if [ ! -z $(pgrep "$HELM_COMMAND") ]; then
     echo "Stopping existing local Helm server."
-    kill -9 "$HELM_PID"
+    kill -9 "$(pgrep "$HELM_COMMAND")"
 fi
 if [ ! -d ./charts ]; then
     mkdir ./charts