Skip to content

Commit

Permalink
Use rbenv actually
Browse files Browse the repository at this point in the history
  • Loading branch information
robotdana committed Nov 27, 2023
1 parent e4660ac commit 9a777bb
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 30 deletions.
3 changes: 1 addition & 2 deletions .spellr_wordlists/english.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ an'd
applescript
argf
asc
asdf
asdfrc
autocorrect
autolint
automain
Expand Down Expand Up @@ -200,6 +198,7 @@ pwd
pyenv
rackup
rakefile
rbenv
rbspy
rcu
rcur
Expand Down
3 changes: 2 additions & 1 deletion Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ tap "homebrew/cask"
tap "homebrew/cask-fonts"
tap "homebrew/core"
tap "homebrew/services"
brew "asdf"
brew "rbenv"
brew "ruby-build"
brew "exercism"
brew "diffr"
brew "git"
Expand Down
10 changes: 6 additions & 4 deletions LaunchAgents/sh.dana.github-cctray.plist
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,18 @@
<string>$PATH</string>
<key>BUNDLE_GEMFILE</key>
<string>$HOME/.dotfiles/github-cctray/Gemfile</string>
<key>ASDF_RUBY_VERSION</key>
<key>RBENV_VERSION</key>
<string>3.2.2</string>
<key>ASDF_DIR</key>
<string>/usr/local/opt/asdf/libexec</string>
</dict>
<key>Label</key>
<string>sh.dana.github-cctray</string>
<key>ProgramArguments</key>
<array>
<string>$HOME/.asdf/shims/bundle</string>
<string>/usr/local/bin/rbenv</string>
<string>exec</string>
<string>bundle</string>
<string>exec</string>
<string>bundle</string>
<string>exec</string>
<string>rackup</string>
<string>-p</string>
Expand Down
13 changes: 0 additions & 13 deletions bash_profile
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,10 @@ if [[ -f /opt/homebrew/bin/brew ]]; then
eval "$(/opt/homebrew/bin/brew shellenv)"
fi

# Brew doesn't finish setting this up, so i must do it
if [[ -d "$(brew --prefix libffi)" ]]; then
export LDFLAGS="-L$(brew --prefix libffi)/lib"
export CPPFLAGS="-I$(brew --prefix libffi)/include"
export PKG_CONFIG_PATH="$(brew --prefix libffi)/lib/pkgconfig"
fi


if [[ -f ~/.cargo/env ]]; then
source /Users/dana/.cargo/env
fi

if [[ -f "$(brew --prefix asdf)/libexec/asdf.sh" ]]; then
source "$(brew --prefix asdf)/libexec/asdf.sh"
source "$(brew --prefix asdf)/etc/bash_completion.d/asdf.bash"
fi

source ~/.dotfiles/locals/secrets.sh
source ~/.dotfiles/functions/nvm_support.sh
source ~/.dotfiles/functions/bash_support.sh
Expand Down
2 changes: 2 additions & 0 deletions functions/ruby_support.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
eval "$(rbenv init - bash)"

function install_bundler {
gem install --no-doc --silent --norc bundler:"$(echo $(tail -n 1 Gemfile.lock))"
}
1 change: 0 additions & 1 deletion scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ echodo ln -sf ~/.dotfiles/gemrc ~/.gemrc
echodo ln -sf ~/.dotfiles/irbrc ~/.irbrc
echodo ln -sf ~/.dotfiles/finicky.js ~/.finicky.js
echodo ln -sf ~/.dotfiles/vimrc ~/.vimrc
echodo ln -sf ~/.dotfiles/asdfrc ~/.asdfrc
echodo mkdir -p ~/.ssh
echodo ln -sf ~/.dotfiles/ssh_config ~/.ssh/config
echodo mkdir -p ~/.bundle
Expand Down
13 changes: 4 additions & 9 deletions scripts/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,10 @@ git submodule add [email protected]:robotdana/github-cctray.git
git_update_submodules
( cd github-cctray && git remote add upstream [email protected]:joejag/github-cctray.git )

if [[ ! -z "$(which asdf)" ]]; then
asdf plugin add nodejs
asdf plugin add ruby

asdf install ruby latest:3.0
asdf install ruby latest:3.1
asdf install ruby latest:3.2
asdf install ruby 3.3.0-preview3
end
rbenv install 3.0
rbenv install 3.1
rbenv install 3.2
rbenv install 3.3.0-preview3

install_launchagents.sh

Expand Down

0 comments on commit 9a777bb

Please sign in to comment.