Reorganise shell paths

Signed-off-by: Michael Barton <mail@michaelbarton.me.uk>

shell_settings/bash/S20_environment

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+USER_BIN=${HOME}/.bin
+LOCAL_BIN=/usr/local/bin
+
+export PATH=${PATH}:${USER_BIN}:${LOCAL_BIN}
+
+export MANWIDTH=80
+export EDITOR=vim
+export VISUAL=vim

shell_settings/bash/S30_aliases

@@ -12,13 +12,8 @@ alias g='git'
 alias log='add_log_entry'
 
 # These have to be functions because ls is aliased to coreutils gls
-function lls {
-  ls -l --color=auto $@
-}
-function lst {
-  ls -ltr --color=auto $@
-}
-
+alias lls='ls -l --color=auto'
+alias lst='ls -ltr --color=auto'
 
 alias vim='vim -w ~/.vim/log "$@"'
 

shell_settings/osx/S10_environment

@@ -1,8 +1,11 @@
-#/bin/bash
+#!/bin/bash
 
 export ORACLE_HOME=/usr/local/Cellar/oracle/11_2
 
 export LOG=~/Dropbox/personal/daily.log
 
 export JAVA_HOME="/Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/jre"
 export EC2_HOME="/usr/local/Cellar/ec2-api-tools/1.7.1.0/libexec"
+
+export GITHUB_TOKEN=`get-pass github.token`
+export HOMEBREW_GITHUB_API_TOKEN=$GITHUB_TOKEN

shell_settings/osx/S10_paths

@@ -1,5 +1,7 @@
 #!/usr/bin/env zsh
 
-PYTHON_PACKAGES=/Users/mbarton/Library/Python/2.7/bin
+PYTHON_PACKAGES=${HOME}/Library/Python/2.7/bin
+RVM_PATH=${HOME}/.rvm/bin
+JIRA_PATH=${HOME}/.jira_bin
 
-PATH=$PATH:$PYTHON_PACKAGES
+export PATH=${PATH}:${PYTHON_PACKAGES}:${RVM_PATH}:${JIRA_PATH}

shell_settings/zsh/S28_colours → shell_settings/osx/S28_colours

@@ -1,4 +1,5 @@
-
+#!/usr/bin/env zsh
+
 if [ "$TERM" != "dumb" ]; then
     eval `dircolors ~/.dir_colors`
     export ZLS_COLORS=$LS_COLORS

shell_settings/zsh/S20_environment

@@ -18,11 +18,6 @@ fpath=($fpath $HOME/.zsh-git/functions)
 cdpath=( ~/cache )
 cd ~/cache
 
-export GEM_HOME="`echo $HOME`/.gem"
-
-export PATH=$GEM_HOME/bin:/usr/local/bin:$PATH
-export PATH=~/.bin:~/.jgi_bin:~/.jira_bin:$PATH
-
 export EMAIL="mail@michaelbarton.me.uk"
 export FULLNAME="Michael Barton"
 
@@ -31,12 +26,6 @@ export GIT_COMMITTER_NAME=$FULLNAME
 export GIT_AUTHOR_EMAIL=$EMAIL
 export GIT_COMMITTER_EMAIL=$EMAIL
 
-export GITHUB_TOKEN=`get-pass github.token`
-export HOMEBREW_GITHUB_API_TOKEN=$GITHUB_TOKEN
-
-export MANWIDTH=80
-export EDITOR=vim
-export VISUAL=vim
 export PAGER='less'
 export LESS='-R -M --shift 5'
 export LESSOPEN="|/usr/local/bin/lesspipe.sh %s"

zshrc

@@ -14,14 +14,14 @@ fi
 
 setopt extended_glob
 
-for zshrc_snipplet in ~/.shell_settings/osx/S[0-9][0-9]*[^~] ; do
+for zshrc_snipplet in ~/.shell_settings/bash/S[0-9][0-9]*[^~] ; do
         source $zshrc_snipplet
 done
 
-for zshrc_snipplet in ~/.shell_settings/bash/S[0-9][0-9]*[^~] ; do
+for zshrc_snipplet in ~/.shell_settings/zsh/S[0-9][0-9]*[^~] ; do
         source $zshrc_snipplet
 done
 
-for zshrc_snipplet in ~/.shell_settings/zsh/S[0-9][0-9]*[^~] ; do
+for zshrc_snipplet in ~/.shell_settings/osx/S[0-9][0-9]*[^~] ; do
         source $zshrc_snipplet
 done