From 5a1d75e06a65fdf000d336a9bd96d1e61eb53281 Mon Sep 17 00:00:00 2001
From: Trevor Merritt <trevor.merritt@gmail.com>
Date: Wed, 27 Apr 2022 07:44:11 -0400
Subject: [PATCH] Adds Helm installer Fixes versions of Kotlin, Java, and
 Gradle in setupKotlin.sh

---
 install.conf.yaml      |  1 +
 scripts/setupHelm.sh   |  4 ++++
 scripts/setupKotlin.sh | 20 +++++++++++++-------
 3 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100755 scripts/setupHelm.sh

diff --git a/install.conf.yaml b/install.conf.yaml
index 4ece520..fef2388 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -53,6 +53,7 @@
         Setting up Kotlin (Get a Coffee the first Time),
       ]
     - [~/.dotfiles/scripts/setupKubectl.sh, Setting up Kubectl]
+    - [~/.dotfiles/scripts/setupHelm.sh, Setting up Helm]
 - git:
     "/home/tmerritt/Projects/dfr":
       url: "https://git.pyrocode.xyz/tmerritt/dfr.git"
diff --git a/scripts/setupHelm.sh b/scripts/setupHelm.sh
new file mode 100755
index 0000000..4f4780a
--- /dev/null
+++ b/scripts/setupHelm.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+ curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
+    
\ No newline at end of file
diff --git a/scripts/setupKotlin.sh b/scripts/setupKotlin.sh
index 494f45f..06ca24a 100755
--- a/scripts/setupKotlin.sh
+++ b/scripts/setupKotlin.sh
@@ -1,15 +1,21 @@
 #!/bin/bash
 
+export KOTLIN_VERSION=1.6.10
+export JAVA_VERSION=11.0.15-zulu
+export GRADLE_VERSION=7.4.2
+
+
 curl -s "https://get.sdkman.io?rcupdate=false" | bash
 source "$HOME/.sdkman/bin/sdkman-init.sh" || sdk version || echo "Try running \"source \
 \"$HOME/.sdkman/bin/sdkman-init.sh\"\""
 
- yes | sdk install kotlin 1.6.21 || true
- sdk default kotlin 1.6.21 || true
+sdk selfupdate force
+ yes | sdk install kotlin $KOTLIN_VERSION || true
+ sdk default kotlin $KOTLIN_VERSION || true
  yes | sdk install kscript || true
- yes | sdk install java 17.0.2-zulu || true
-sdk default java 17.0.2-zulu || true
- yes | sdk install java 17 || true
-sdk default java 17 || true
-yes | sdk install gradle 7.4.2 || true
+ yes | sdk install java $JAVA_VERSION || true
+sdk default java $JAVA_VERSION || true
+ yes | sdk install java $JAVA_VERSION || true
+sdk default java $JAVA_VERSION || true
+yes | sdk install gradle $GRADLE_VERSION || true
 sdk default gradle || true