From abb5f45c7f7210d3d2c64b0b4ed196c9cb7c3956 Mon Sep 17 00:00:00 2001 From: Trevor Merritt Date: Thu, 17 Mar 2022 14:01:41 -0400 Subject: [PATCH] updates cx2 host address updates kotlin and gradle removes auto-terraform. --- configs/ssh/config | 4 ++-- scripts/setupKotlin.sh | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configs/ssh/config b/configs/ssh/config index 431a6e1..2407948 100644 --- a/configs/ssh/config +++ b/configs/ssh/config @@ -11,7 +11,7 @@ Host 172.24.4.115 Host 10.1.24.115 HostName 10.1.24.115 User tmerritt -Host 10.1.*.* +#Host 10.1.*.* # PermitLocalCommand yes - # Unfortunately ssh does not support line breaks in config files +# # Unfortunately ssh does not support line breaks in config files # LocalCommand ssh -o PermitLocalCommand=no %n "which git >/dev/null && ([[ -d ~/.dotfiles ]] && (echo "Updating dotfiles on %h ..." && cd ~/.dotfiles && git pull -q && ./install >/dev/null) || (echo "Installing dotfiles on %h ..." && git clone -q http://gitea.pyrocode.xyz/tmerritt/dotfiles.git ~/.dotfiles && ./.dotfiles/install >/dev/null))" diff --git a/scripts/setupKotlin.sh b/scripts/setupKotlin.sh index 1a92d9e..494f45f 100755 --- a/scripts/setupKotlin.sh +++ b/scripts/setupKotlin.sh @@ -4,9 +4,12 @@ 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 || true + yes | sdk install kotlin 1.6.21 || true + sdk default kotlin 1.6.21 || 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 gradle || true + yes | sdk install java 17 || true +sdk default java 17 || true +yes | sdk install gradle 7.4.2 || true sdk default gradle || true