diff --git a/VARIABLES b/VARIABLES index a570952..6bcbf5d 100644 --- a/VARIABLES +++ b/VARIABLES @@ -1,4 +1,4 @@ export KOTLIN_VERSION=1.8.0 export JAVA_VERSION=11.0.17-tem -export GRADLE_VERSION=7.6 -export GRAAL_VERSION=22.3.0 +export GRADLE_VERSION=8.0.1 +export GRAAL_VERSION=22.3.r19 diff --git a/install.conf.yaml b/install.conf.yaml index 497cfd5..63853e5 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -48,16 +48,8 @@ ~/.local/bin/fixWireguard.sh: scripts/toInstall/fixWireguard.sh - shell: - [ - sudo apt install remmina remmina-plugin-vnc remmina-plugin-rdp -y, - Install Remmina, - ] - - [ - sudo apt install nmap tmux nmon htop axel ssh -y, - Installing apps Trevor uses... - ] - - [ - sudo apt install zsh zsh-syntax-highlighting -y, - Installing ZSH and its plugins, + sudo apt install remmina remmina-plugin-vnc remmina-plugin-rdp nmap tmux nmon htop axel ssh zsh zsh-syntax-highlighting -y, + Install packages Trevor likes. If you dont, use something else. ] - [git submodule update --init --recursive, Installing submodules] - [fc-cache -fv, Updating Font Cache] @@ -67,7 +59,6 @@ ] - [~/.dotfiles/scripts/setupKubectl.sh, Setting up Kubectl] - [~/.dotfiles/scripts/setupHelm.sh, Setting up Helm] - - [~/.dotfiles/scripts/setupGraalVM.sh, Setting up Graal Native Build Tools] #- git: # "/home/tmerritt/Projects/dfr": # url: "https://git.pyrocode.xyz/tmerritt/dfr.git" diff --git a/scripts/setupGraalVM.sh b/scripts/setupGraalVM.sh deleted file mode 100755 index d46dbce..0000000 --- a/scripts/setupGraalVM.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -GRAAL_INSTALL_FILENAME=graalvm-ce-java19-linux-amd64-$GRAAL_VERSION.tar.gz -GRAAL_INSTALL_DIR=/opt/graalvm -GRAAL_INSTALL_URL="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${GRAAL_VERSION}/${GRAAL_INSTALL_FILENAME}" -#### - -source ../VARIABLES -if [ -d $GRAAL_INSTALL_DIR ] -then - echo "GraalVM Already Installed. Have a nice day." -else - echo "Starting to setup GraalVM from $GRAAL_INSTALL_URL to $GRAAL_INSTALL_DIR" - mkdir -p $GRAAL_INSTALL_DIR - cd $GRAAL_INSTALL_DIR - wget $GRAAL_INSTALL_URL - tar xzvf $GRAAL_INSTALL_FILENAME --strip-components=1 - rm $GRAAL_INSTALL_FILENAME - bin/gu install native-image -fi - diff --git a/scripts/setupKotlin.sh b/scripts/setupKotlin.sh index f7a78e6..7b777d7 100755 --- a/scripts/setupKotlin.sh +++ b/scripts/setupKotlin.sh @@ -6,13 +6,19 @@ 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\"\"" +# Update sdkman sdk selfupdate force + +# install and setup Kotlin yes | sdk install kotlin $KOTLIN_VERSION || true sdk default kotlin $KOTLIN_VERSION || true yes | sdk install kscript || true + +# Install and setup GraalVM and regular JDK + yes | sdk install java $GRAAL_VERSION || 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 + +# Install and setup gradle yes | sdk install gradle $GRADLE_VERSION || true sdk default gradle || true