Getting ready for asdf version 0.16.0

Author: missingcharacter

MacOS/bash_profile

@@ -3,12 +3,30 @@ if [[ "$(uname -m)" == 'arm64' ]]; then
 else
   eval "$(/usr/local/bin/brew shellenv)"
 fi
+
 # Homebrew's Bash completion stuff
 if [ -f "$(brew --prefix)"/etc/bash_completion ]; then
   # shellcheck disable=SC1091
   source "$(brew --prefix)"/etc/bash_completion
 fi
 
+# `asdf` is now managed by homebrew
+# shellcheck disable=SC1090
+. <(asdf completion bash)
+# Hook direnv into your shell.
+# shellcheck disable=SC1091
+. "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/bashrc"
+
+# Go specific env vars
+GOPATH="${HOME}/src/gopath"
+GOROOT="$(asdf where golang)/go"
+export GOPATH GOROOT
+
+# Java specific env vars
+JDK_HOME="$(asdf where java)"
+JAVA_HOME="$(asdf where java)/jre"
+export JDK_HOME JAVA_HOME
+
 # Update PATH
 export PATH="$(brew --prefix)/opt/curl/bin:${PATH}:${HOME}/src/gopath/bin:${HOME}/bin"
 

Ubuntu/bash_profile

@@ -1,4 +1,22 @@
 eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+
+# `asdf` is now managed by homebrew
+# shellcheck disable=SC1090
+. <(asdf completion bash)
+# Hook direnv into your shell.
+# shellcheck disable=SC1091
+. "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/bashrc"
+
+# Go specific env vars
+GOPATH="${HOME}/src/gopath"
+GOROOT="$(asdf where golang)/go"
+export GOPATH GOROOT
+
+# Java specific env vars
+JDK_HOME="$(asdf where java)"
+JAVA_HOME="$(asdf where java)/jre"
+export JDK_HOME JAVA_HOME
+
 # check the window size after each command and, if necessary,
 # update the values of LINES and COLUMNS.
 shopt -s checkwinsize

bash_profile

@@ -22,29 +22,10 @@ if [ -f "${HOME}"/.bash_aliases ]; then
   . "${HOME}"/.bash_aliases
 fi
 
-# https://asdf-vm.com/guide/getting-started.html#_3-install-asdf
-# shellcheck disable=SC1091
-. "${HOME}"/.asdf/asdf.sh
-# shellcheck disable=SC1091
-. "${HOME}"/.asdf/completions/asdf.bash
-# Hook direnv into your shell.
-# shellcheck disable=SC1091
-. "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/bashrc"
-
 # Change Pinta Language back to english
 #export LANG=en_GB
 #export LANG=en_US.UTF-8
 
-# Go specific env vars
-GOPATH="${HOME}/src/gopath"
-GOROOT="$(asdf where golang)/go"
-export GOPATH GOROOT
-
-# Java specific env vars
-JDK_HOME="$(asdf where java)"
-JAVA_HOME="$(asdf where java)/jre"
-export JDK_HOME JAVA_HOME
-
 # Verbose terraform stderr
 # export TF_LOG="TRACE"