From cd1155792bf11c41f2ba80098ae90a297032da3f Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Thu, 16 Nov 2017 10:22:02 -0800
Subject: [PATCH] Fix paths for rvm and pip

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

diff --git a/assets/default/dotfiles/bashrc b/assets/default/dotfiles/bashrc
index 2ebef77..6405361 100644
--- a/assets/default/dotfiles/bashrc
+++ b/assets/default/dotfiles/bashrc
@@ -55,8 +55,10 @@ fi
 export PATH=$HOME/bin:$HOME/.local/bin:$PATH
 
 # Add RVM to PATH for scripting
-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*
+if [ -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
 
 # Increase memory sizes for java using Ant
 ANT_OPTS="-Xmx2048m -Xms512m"
diff --git a/assets/default/fish/init/paths.fish b/assets/default/fish/init/paths.fish
index 1129981..790cfad 100644
--- a/assets/default/fish/init/paths.fish
+++ b/assets/default/fish/init/paths.fish
@@ -25,6 +25,7 @@ else if [ $det_os = "mac" ]
     # set PATH $HOME/Library/Python/2.7/bin $PATH
     # Fix Python path on OSX to avoid considering System extras over newer versions
     set -gx PYTHONPATH /opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages:$PYTHONPATH
+    set -gx PATH $PATH /opt/local/Library/Frameworks/Python.framework/Versions/Current/bin
 end
 
 # Google GO
@@ -38,5 +39,11 @@ if [ -d "$android_sdk" ]
     set -gx PATH $PATH $android_sdk/platform-tools $android_sdk/tools
 end
 
+# Ruby paths
+# Add RVM to PATH for scripting
+if [ -d "$HOME/.rvm" ]
+    set -gx PATH $PATH $HOME/.rvm/bin
+end
+
 # Home path
 set -gx  PATH $HOME/bin $HOME/.local/bin  $PATH