vividboarder/shoestrap
1
0
Fork 0
mirror of https://github.com/ViViDboarder/shoestrap.git synced 2024-11-01 00:26:30 +00:00
Code Issues Releases Wiki Activity

Small fixups of paths

Browse Source
This commit is contained in:
ViViDboarder 2016-02-04 10:33:08 -08:00
parent 7ce308e8c2
commit 96e35a7ebe
2 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
assets/default/dotfiles/bashrc
View File

@ -16,26 +16,41 @@ fi
# Common paths for me # Common paths for me
export PATH=$PATH:$ANT_HOME/bin export PATH=$PATH:$ANT_HOME/bin
# Opt directory # Opt directory
export PATH=/opt/local/bin:/opt/local/sbin:$PATH if [ -d /opt/local ]; then
# Android SDK export PATH=/opt/local/bin:/opt/local/sbin:$PATH
fi
export GOROOT=/usr/local/go
if [ -d "$GOROOT" ]; then
export PATH=$PATH:$GOROOT/bin
fi
if [[ "$DET_OS" == "linux" ]]; then if [[ "$DET_OS" == "linux" ]]; then
ANDROID_SDK=$HOME/workspace/adt-bundle-linux/sdk ANDROID_SDK=$HOME/workspace/adt-bundle-linux/sdk
export GOROOT=/usr/local/go
export PATH=$PATH:$GOROOT/bin
elif [[ "$DET_OS" == "mac" ]]; then elif [[ "$DET_OS" == "mac" ]]; then
ANDROID_SDK=$HOME/workspace/android-sdk-macosx ANDROID_SDK=$HOME/workspace/android-sdk-macosx
export PATH=$HOME/Library/Python/2.7/bin:$PATH
go_workspace=$HOME/workspace/go_workspace
if [ -d "$go_workspace" ]; then
export GOPATH=$go_workspace
export PATH=$PATH:$GOPATH/bin
fi
# Fix Python path on OSX to avoid considering System extras over newer versions # Fix Python path on OSX to avoid considering System extras over newer versions
export PYTHONPATH=/Library/Python/2.7/site-packages:$PYTHONPATH # export PATH=$HOME/Library/Python/2.7/bin:$PATH
# export PYTHONPATH=/Library/Python/2.7/site-packages:$PYTHONPATH
export PYTHONPATH=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages:/Library/Python/2.7/site-packages:$PYTHONPATH
fi fi
# Android paths
export ANDROID_HOME=$ANDROID_SDK export ANDROID_HOME=$ANDROID_SDK
export PATH=$PATH:$ANDROID_SDK/platform-tools:$ANDROID_SDK/tools export PATH=$PATH:$ANDROID_SDK/platform-tools:$ANDROID_SDK/tools
# Add RVM to PATH for scripting
export PATH=$PATH:$HOME/.rvm/bin # Home path
# Add ~/bin
export PATH=$HOME/bin:$PATH export PATH=$HOME/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* [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
# Increase memory sizes for java using Ant # Increase memory sizes for java using Ant

30
assets/default/fish-config/paths.fish
View File

@ -10,24 +10,28 @@ switch (uname)
end end
# opt directory # opt directory
set -gx PATH /opt/local/bin /opt/local/sbin $PATH if [ -d /opt/local ]
set -gx PATH /opt/local/bin /opt/local/sbin $PATH
end
# Google GO
set -gx GOROOT /usr/local/go
if [ -d "$GOROOT" ]
set -gx PATH $PATH $GOROOT/bin
end
if [ $det_os = "linux" ] if [ $det_os = "linux" ]
set android_sdk $HOME/workspace/adt-bundle-linux/sdk set android_sdk $HOME/workspace/adt-bundle-linux/sdk
set -gx GOROOT /usr/local/go
set -gx PATH $PATH $GOROOT/bin
else if [ $det_os = "mac" ] else if [ $det_os = "mac" ]
set android_sdk $HOME/workspace/android-sdk-macosx set android_sdk $HOME/workspace/android-sdk-macosx
set go_workspace $HOME/workspace/go_workspace
if [ -d "$go_workspace" ]
set -gx GOPATH $go_workspace
set -gx PATH $PATH $GOPATH/bin
end
# set PATH $HOME/Library/Python/2.7/bin $PATH # set PATH $HOME/Library/Python/2.7/bin $PATH
set -gx GOROOT /usr/local/go
set -gx PATH $PATH $GOROOT/bin
set go_workspace $HOME/workspace/go
set -gx PATH $PATH $go_workspace/bin
set -gx GOPATH $go_workspace $GOROOT
# Fix Python path on OSX to avoid considering System extras over newer versions # 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 /Library/Python/2.7/site-packages $PYTHONPATH set -gx PYTHONPATH /opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages /Library/Python/2.7/site-packages $PYTHONPATH
end end
@ -38,9 +42,11 @@ end
# set -gx PATH $bin_path $PATH # set -gx PATH $bin_path $PATH
# set -gx PYTHONPATH "$sdk_dir/platform/google_appengine" $PYTHONPATH # set -gx PYTHONPATH "$sdk_dir/platform/google_appengine" $PYTHONPATH
# Android paths
set -gx ANDROID_HOME $android_sdk set -gx ANDROID_HOME $android_sdk
set -gx PATH $PATH $android_sdk/platform-tools $android_sdk/tools set -gx PATH $PATH $android_sdk/platform-tools $android_sdk/tools
# Home path
set -gx PATH $HOME/bin $PATH set -gx PATH $HOME/bin $PATH
#[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function* #[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*