Skip to content

Commit

Permalink
Buildkite geared more for rbenv than asdf
Browse files Browse the repository at this point in the history
  • Loading branch information
tommeier committed Oct 6, 2023
1 parent 035ac51 commit f1fd868
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
12 changes: 6 additions & 6 deletions bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ fi

# Load ASDF (https://github.com/asdf-vm/asdf)
# Location: $(brew --prefix asdf)
. $(brew --prefix asdf)/libexec/asdf.sh
# . $(brew --prefix asdf)/libexec/asdf.sh

if [ -d $HOME/.asdf/plugins/java/ ]; then
source $HOME/.asdf/plugins/java/set-java-home.bash
#source $HOME/.asdf/plugins/java/set-java-home.zsh
fi
# if [ -d $HOME/.asdf/plugins/java/ ]; then
# source $HOME/.asdf/plugins/java/set-java-home.bash
# #source $HOME/.asdf/plugins/java/set-java-home.zsh
# fi

# Ruby via Rbenv (deprecated - use asdf)
# eval "$(rbenv init -)"
eval "$(rbenv init -)"

# Node
eval "$(nodenv init -)"
Expand Down
10 changes: 6 additions & 4 deletions zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@ export TERM="xterm-256color"

# Load ASDF (https://github.com/asdf-vm/asdf)
# Location: $(brew --prefix asdf)
. $(brew --prefix asdf)/libexec/asdf.sh
# . $(brew --prefix asdf)/libexec/asdf.sh

if [ -d $HOME/.asdf/plugins/java/ ]; then
source $HOME/.asdf/plugins/java/set-java-home.zsh
fi
eval "$(rbenv init -)"

# if [ -d $HOME/.asdf/plugins/java/ ]; then
# source $HOME/.asdf/plugins/java/set-java-home.zsh
# fi

# Added by OrbStack: command-line tools and integration
source ~/.orbstack/shell/init.zsh 2>/dev/null || :

0 comments on commit f1fd868

Please sign in to comment.