diff --git a/dotfiles/.profile b/dotfiles/.profile index 38b1063b..d9c4cddc 100644 --- a/dotfiles/.profile +++ b/dotfiles/.profile @@ -202,28 +202,10 @@ fi export GOPATH="${HOME}/.local/go" export GO111MODULE=on export PATH="$PATH:${GOPATH}/bin" - -if command -v brew >/dev/null; then - ### Go - if command -v go > /dev/null; then - GOROOT="$(brew --prefix golang)/libexec" - export GOROOT - export PATH="$PATH:${GOROOT}/bin" - fi - - ### ASDF - if command -v asdf > /dev/null; then - export ASDF_CONFIG_FILE="$HOME/.config/asdf/asdfrc" - export ASDF_DIR="$HOME/.local/asdf" - # export ASDF_DATA_DIR="$HOME/.local/asdf" - export ASDF_CRATE_DEFAULT_PACKAGES_FILE="$HOME/.config/asdf/default-cargo-pkgs - export ASDF_GEM_DEFAULT_PACKAGES_FILE="$HOME/.config/asdf/default-ruby-pkgs - export ASDF_GOLANG_DEFAULT_PACKAGES_FILE="$HOME/.config/asdf/default-golang-pkgs - export ASDF_PYTHON_DEFAULT_PACKAGES_FILE="$HOME/.config/asdf/default-python-pkgs - if [ -f "$(brew --prefix asdf)/libexec/asdf.sh" ]; then - . "$(brew --prefix asdf)/libexec/asdf.sh" - fi - fi +if command -v brew >/dev/null && command -v go > /dev/null; then + GOROOT="$(brew --prefix golang)/libexec" + export GOROOT + export PATH="$PATH:${GOROOT}/bin" fi ### Android Studio @@ -232,6 +214,20 @@ export PATH="$PATH:~/Library/Android/sdk/platform-tools" export PATH="$PATH:~/Library/Android/sdk/tools/bin" export PATH="$PATH:~/Library/Android/sdk/tools" +### ASDF +if command -v asdf > /dev/null; then + export ASDF_CONFIG_FILE="$HOME/.config/asdf/asdfrc" + export ASDF_DIR="$HOME/.local/asdf" + export ASDF_DATA_DIR="$HOME/.local/asdf-data" + export ASDF_CRATE_DEFAULT_PACKAGES_FILE="$HOME/.config/asdf/default-cargo-pkgs + export ASDF_GEM_DEFAULT_PACKAGES_FILE="$HOME/.config/asdf/default-ruby-pkgs + export ASDF_GOLANG_DEFAULT_PACKAGES_FILE="$HOME/.config/asdf/default-golang-pkgs + export ASDF_PYTHON_DEFAULT_PACKAGES_FILE="$HOME/.config/asdf/default-python-pkgs + if [ -f "$HOME/.local/asdf/asdf.sh" ]; then + . "$HOME/.local/asdf/asdf.sh" + fi +fi + ### fzf if [ -d /usr/local/opt/fzf/bin ]; then PATH="$PATH:/usr/local/opt/fzf/bin"