From 7a8fb3370e78822316dfde9cf52d86a76f78b1cc Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Wed, 12 Jun 2019 11:06:33 -0700
Subject: [PATCH] Update rvm and add rbenv

---
 assets/default/dotfiles/bashrc      | 5 ++++-
 assets/default/fish/init/paths.fish | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/assets/default/dotfiles/bashrc b/assets/default/dotfiles/bashrc
index 44bca58..a315f45 100644
--- a/assets/default/dotfiles/bashrc
+++ b/assets/default/dotfiles/bashrc
@@ -55,7 +55,10 @@ fi
 export PATH=$HOME/bin:$HOME/.local/bin:$PATH
 
 # Add RVM to PATH for scripting
-if [ -d "$HOME/.rvm" ]; then
+if type rbenv &> /dev/null; then
+    export PATH="$HOME/.rbenv/bin:$PATH"
+    eval "$(rbenv init -)"
+elif [ -d "$HOME/.rvm" ]; then
     export PATH="$PATH:$HOME/.rvm/bin"
     [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
 fi
diff --git a/assets/default/fish/init/paths.fish b/assets/default/fish/init/paths.fish
index dcac5df..0e5bf40 100644
--- a/assets/default/fish/init/paths.fish
+++ b/assets/default/fish/init/paths.fish
@@ -44,9 +44,11 @@ if [ -d "$android_sdk" ]
 end
 
 # Ruby paths
-# Add RVM to PATH for scripting
-if [ -d "$HOME/.rvm" ]
+if type -q rbenv ; and status --is-interactive
+    source (rbenv init -|psub)
+else if [ -d "$HOME/.rvm" ]
     set -gx PATH $PATH $HOME/.rvm/bin
+    source "$HOME/.rvm/scripts/extras/rvm.fish"
 end
 
 # NPM paths