From 9e1300e73e9d22de4799e25cd0ae56f45a70450f Mon Sep 17 00:00:00 2001
From: Elliot Wright <wright.elliot@gmail.com>
Date: Thu, 7 Nov 2019 10:55:15 +0000
Subject: [PATCH] Fixed issue where index.yaml was never merged with existing
 one. Ran through shellcheck and fixed issues.

---
 push-helm-charts.sh | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)
 mode change 100644 => 100755 push-helm-charts.sh

diff --git a/push-helm-charts.sh b/push-helm-charts.sh
old mode 100644
new mode 100755
index a863f6b..9723a3e
--- a/push-helm-charts.sh
+++ b/push-helm-charts.sh
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
- set -xeuo pipefail
+set -xeuo pipefail
 
- helm init --client-only
+helm init --client-only
 
- #####
+#####
 # set up the repo dir, and package up all charts
 #####
 CHARTS_REPO=${PLUGIN_CHARTS_REPO:-"https://athens.blob.core.windows.net"}
@@ -13,25 +13,28 @@ REPO_DIR=bin/charts # This is where we do the charge merge and dirty things up,
 mkdir -p $REPO_DIR
 echo "entering $REPO_DIR"
 cd $REPO_DIR
-if curl --output /dev/null --silent --head --fail ${CHARTS_REPO}/${CHARTS_BUCKET}/index.yaml; then
+if curl --output /dev/null --silent --head --fail "$CHARTS_REPO/$CHARTS_BUCKET/index.yaml"; then
   echo "downloading existing index.yaml"
-  curl -sLO ${CHARTS_REPO}/${CHARTS_BUCKET}/index.yaml
+  curl -sLO "$CHARTS_REPO/$CHARTS_BUCKET/index.yaml"
 fi
 
- #####
+#####
 # package the charts
 #####
-for dir in `ls ../../charts`;do
-    if [ ! -f ../../charts/$dir/Chart.yaml ];then
-        echo "skipping $dir because it lacks a Chart.yaml file"
-    else
-        echo "packaging $dir"
-        helm dep build ../../charts/$dir
-        helm package ../../charts/$dir
-    fi
+for dir in ../../charts/*; do
+  [[ -e "$dir" ]] || break # handle case of no charts
+  [[ -d "$dir" ]] || continue # handle case that $dir is a file
+
+  if [ ! -f "$dir/Chart.yaml" ]; then
+    echo "skipping $dir because it lacks a Chart.yaml file"
+  else
+    echo "packaging $dir"
+    helm dep build "$dir"
+    helm package "$dir"
+  fi
 done
 
- if [ -f $REPO_DIR/index.yaml ]; then
+if [ -f ./index.yaml ]; then
   echo "merging with existing index.yaml"
   helm repo index --url "$CHARTS_REPO/$CHARTS_BUCKET" --merge index.yaml .
 else
@@ -39,12 +42,12 @@ else
   helm repo index .
 fi
 
- #####
+#####
 # upload to Azure blob storage
 #####
 if [ ! -v AZURE_STORAGE_CONNECTION_STRING ]; then
-    echo "AZURE_STORAGE_CONNECTION_STRING env var required to publish"
-    exit 1
+  echo "AZURE_STORAGE_CONNECTION_STRING env var required to publish"
+  exit 1
 fi
 echo "uploading from $PWD"
-az storage blob upload-batch --destination $CHARTS_BUCKET --source .
\ No newline at end of file
+az storage blob upload-batch --destination $CHARTS_BUCKET --source .