From a95135401dc85a8543a34ef3db89bf7e2c1105b3 Mon Sep 17 00:00:00 2001
From: Roger Cundiff <rogerleecundiff@gmail.com>
Date: Mon, 18 May 2020 14:03:23 -0500
Subject: [PATCH 1/2] For kappnav org install dev tag

---
 install.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/install.sh b/install.sh
index 1c69181..2bb567a 100755
--- a/install.sh
+++ b/install.sh
@@ -2,7 +2,7 @@
 
 #*****************************************************************
 #*
-#* Copyright 2019 IBM Corporation
+#* Copyright 2019, 2020 IBM Corporation
 #*
 #* Licensed under the Apache License, Version 2.0 (the "License");
 #* you may not use this file except in compliance with the License.
@@ -18,17 +18,16 @@
 #*****************************************************************
 org=$1
 kubeenv=$2
-arg=$org
 # make sure running in build directory 
 if [ $(echo $PWD | awk '{ n=split($0,d,"/"); print d[n] }') != 'build' ]; then 
     echo 'Error: $kappnav/build dir must be current dir.'
     echo ''
-    arg="--?"
+    org="--?"
 fi
 
-if [ x$arg == x'--?' ] || [ x$arg == 'x' ]; then
+if [ x$org == x'--?' ] || [ x$org == 'x' ]; then
     echo "Install kAppNav from specified dockerhub.com organization."
-	echo "Will install images tagged latest."
+	echo "Will install images tagged latest, but if org is kappnav will install dev tag"
 	echo 
 	echo "syntax:" 
 	echo 
@@ -57,7 +56,15 @@ if [ -d ../operator ]; then
 	echo Install kappnav to kubeenv $kubeenv
 	kubectl create namespace kappnav 
 
-	cat ../operator/kappnav.yaml | sed "s|kubeEnv: okd|kubeEnv: $kubeenv|" | sed "s|repository: kappnav/|repository: $org/kappnav-|" | sed "s|tag: $tag|tag: latest|" | sed "s|image: kappnav/operator:$tag|image: $org/kappnav-operator:latest|" | kubectl create -f - -n kappnav 
+    if [ $org == 'kappnav' ]; then
+	    #imagePrefix will be "" in this case
+		newTag=dev
+    else
+	    imagePrefix=kappnav-
+		newTag=latest
+	fi
+	operator=operator 
+	cat ../operator/kappnav.yaml | sed "s|kubeEnv: okd|kubeEnv: $kubeenv|" | sed "s|repository: kappnav/|repository: $org/$imagePrefix|" | sed "s|tag: $tag|tag: $newTag|" | sed "s|image: kappnav/operator:$tag|image: $org/$imagePrefix$operator:$newTag|" | kubectl create -f - -n kappnav 
 else
 	echo Cannot install: file ../operator/kappnav.yaml not found. 
 	exit 1

From aa12b45c306dfeef441b20898c6f07490ee5e9d2 Mon Sep 17 00:00:00 2001
From: Roger Cundiff <rogerleecundiff@gmail.com>
Date: Mon, 18 May 2020 14:13:04 -0500
Subject: [PATCH 2/2] Formatting only

---
 install.sh | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/install.sh b/install.sh
index 2bb567a..a184514 100755
--- a/install.sh
+++ b/install.sh
@@ -27,45 +27,45 @@ fi
 
 if [ x$org == x'--?' ] || [ x$org == 'x' ]; then
     echo "Install kAppNav from specified dockerhub.com organization."
-	echo "Will install images tagged latest, but if org is kappnav will install dev tag"
-	echo 
-	echo "syntax:" 
-	echo 
-	echo "install.sh <docker organization> [kube env]"
-	echo 
-	echo "kube env is one of:  ocp, okd, minikube.  Default is okd."
-	exit 1
+    echo "Will install images tagged latest, but if org is kappnav will install dev tag"
+    echo 
+    echo "syntax:" 
+    echo 
+    echo "install.sh <docker organization> [kube env]"
+    echo 
+    echo "kube env is one of:  ocp, okd, minikube.  Default is okd."
+    exit 1
 fi
 
 # set default kubeenv if not specified 
 if [ x$kubeenv == 'x' ]; then
-	kubeenv=okd
+    kubeenv=okd
 else
 # validate
-	if ! [ $kubeenv == 'ocp' ] && ! [ $kubeenv == 'okd' ] && ! [ $kubeenv == 'minikube' ]; then
-		echo "kubeEnv $kubeenv value is not valid.  Must be ocp, okd, or minikube"
-		exit 1
-	fi
+    if ! [ $kubeenv == 'ocp' ] && ! [ $kubeenv == 'okd' ] && ! [ $kubeenv == 'minikube' ]; then
+        echo "kubeEnv $kubeenv value is not valid.  Must be ocp, okd, or minikube"
+        exit 1
+    fi
 fi
 
 if [ -d ../operator ]; then 
 
-	# pluck image tag off operator image 
-	tag=$(cat ../operator/kappnav.yaml | grep operator: | awk '{ split($0,p,":"); print p[3] }')
+    # pluck image tag off operator image 
+    tag=$(cat ../operator/kappnav.yaml | grep operator: | awk '{ split($0,p,":"); print p[3] }')
 
-	echo Install kappnav to kubeenv $kubeenv
-	kubectl create namespace kappnav 
+    echo Install kappnav to kubeenv $kubeenv
+    kubectl create namespace kappnav 
 
     if [ $org == 'kappnav' ]; then
-	    #imagePrefix will be "" in this case
-		newTag=dev
+        #imagePrefix will be "" in this case
+        newTag=dev
     else
-	    imagePrefix=kappnav-
-		newTag=latest
-	fi
-	operator=operator 
-	cat ../operator/kappnav.yaml | sed "s|kubeEnv: okd|kubeEnv: $kubeenv|" | sed "s|repository: kappnav/|repository: $org/$imagePrefix|" | sed "s|tag: $tag|tag: $newTag|" | sed "s|image: kappnav/operator:$tag|image: $org/$imagePrefix$operator:$newTag|" | kubectl create -f - -n kappnav 
+        imagePrefix=kappnav-
+        newTag=latest
+    fi
+    operator=operator 
+    cat ../operator/kappnav.yaml | sed "s|kubeEnv: okd|kubeEnv: $kubeenv|" | sed "s|repository: kappnav/|repository: $org/$imagePrefix|" | sed "s|tag: $tag|tag: $newTag|" | sed "s|image: kappnav/operator:$tag|image: $org/$imagePrefix$operator:$newTag|" | kubectl create -f - -n kappnav 
 else
-	echo Cannot install: file ../operator/kappnav.yaml not found. 
-	exit 1
+    echo Cannot install: file ../operator/kappnav.yaml not found. 
+    exit 1
 fi