From 79cb856fab97ff96118eab9bb88d6adf0ce1448c Mon Sep 17 00:00:00 2001
From: Phil Sphicas <phil.sphicas@att.com>
Date: Mon, 14 Mar 2022 07:50:37 -0700
Subject: [PATCH] Update Helm wrapper script

Small updates to incorporate shellcheck recommendations.

Change-Id: I450706b404735f07eef8cf605303363030db16b3
---
 .../templates/roles/common/usr/local/bin/helm      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/promenade/templates/roles/common/usr/local/bin/helm b/promenade/templates/roles/common/usr/local/bin/helm
index bb9ef6a7..92380926 100755
--- a/promenade/templates/roles/common/usr/local/bin/helm
+++ b/promenade/templates/roles/common/usr/local/bin/helm
@@ -1,20 +1,22 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -e
 
+IMAGE_HELM:="{{ config['HostSystem:images.helm.helm'] }}"
+
 if [ "x$(pwd)" = "x/" ]; then
     UPDIR=/
     WORKDIR=/up
 else
     UPDIR=$(pwd)/..
-    WORKDIR=/up/$(basename $(pwd))
+    WORKDIR=/up/$(basename "$(pwd)")
 fi
 
 exec docker run --rm \
     --net host \
-    -v $UPDIR:/up \
+    -v "$UPDIR":/up \
     -v /etc/kubernetes/admin:/etc/kubernetes/admin \
-    -w $WORKDIR \
+    -w "$WORKDIR" \
     -e KUBECONFIG=/etc/kubernetes/admin/kubeconfig.yaml \
-    {{ config['HostSystem:images.helm.helm'] }} \
-        $*
+    "$IMAGE_HELM" \
+        "$@"