From f866f6a2ea1ead8a9f21ade5e03b97439e9ad3c3 Mon Sep 17 00:00:00 2001 From: ViViDboarder Date: Wed, 26 Aug 2015 14:29:51 -0700 Subject: [PATCH] Fix go paths --- assets/default/dotfiles/tmux.conf | 2 +- assets/default/fish/custom/paths.load | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/assets/default/dotfiles/tmux.conf b/assets/default/dotfiles/tmux.conf index a5b6e0f..89e9a23 100644 --- a/assets/default/dotfiles/tmux.conf +++ b/assets/default/dotfiles/tmux.conf @@ -6,7 +6,7 @@ set-option -g set-titles on set-option -g set-titles-string '[#S:#I] #W' # copy and paster -if-shell 'test "$(uname -s)" = "Darwin"' 'set-option -g default-command "reattach-to-user-namespace-tmux $SHELL"' +# if-shell 'test "$(uname -s)" = "Darwin"' 'set-option -g default-command "reattach-to-user-namespace-tmux $SHELL"' # look good set -g default-terminal "screen-256color" diff --git a/assets/default/fish/custom/paths.load b/assets/default/fish/custom/paths.load index 23a926f..90d90b0 100644 --- a/assets/default/fish/custom/paths.load +++ b/assets/default/fish/custom/paths.load @@ -21,13 +21,23 @@ else if [ $det_os = "mac" ] set android_sdk $HOME/workspace/android-sdk-macosx # set PATH $HOME/Library/Python/2.7/bin $PATH - set -gx GOROOT $HOME/workspace/go + 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 - set -gx PYTHONPATH /Library/Python/2.7/site-packages $PYTHONPATH + # set -gx PYTHONPATH /Library/Python/2.7/site-packages $PYTHONPATH end +# Google cloud sdk +# set sdk_dir "$HOME/workspace/google-cloud-sdk" +# set bin_path "$sdk_dir/bin" +# set -gx PATH $bin_path $PATH +# set -gx PYTHONPATH "$sdk_dir/platform/google_appengine" $PYTHONPATH + set -gx ANDROID_HOME $android_sdk set -gx PATH $PATH $android_sdk/platform-tools $android_sdk/tools