zsh: Make sure personal script are prefered over brew paths

[dotfiles.git] / zshrc

diff --git a/zshrc b/zshrc
index 7386556ba9e8db1f5c0695de1c1e55b142bbbbbc..e24a831b9c060c0f600d5e2b88989bd9ddaa7e92 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -1,8 +1,10 @@
 # Path to config files
 ZSH=$XDG_CONFIG_HOME/zsh
 # Path to config files
 ZSH=$XDG_CONFIG_HOME/zsh

+ZSH_DATA=$XDG_DATA_HOME/zsh

 ZSH_CACHE=$XDG_CACHE_HOME/zsh
 ZSH_CACHE=$XDG_CACHE_HOME/zsh

-[[ ! -d "$ZSH" ]] && echo "Missing config dir: '$ZSH'" && return
+[[ ! -d "$ZSH" ]]       && echo "Missing config dir: '$ZSH'"      && return

 [[ ! -d "$ZSH_CACHE" ]] && echo "Missing cache dir: '$ZSH_CACHE'" && return
 [[ ! -d "$ZSH_CACHE" ]] && echo "Missing cache dir: '$ZSH_CACHE'" && return

+[[ ! -d "$ZSH_DATA" ]]  && echo "Missing data dir: '$ZSH_DATA'"   && return

 
 # Load all of the config files in $ZSH/lib that end in .zsh
 for config_file ($ZSH/lib/*.zsh); do
 
 # Load all of the config files in $ZSH/lib that end in .zsh
 for config_file ($ZSH/lib/*.zsh); do


@@ -36,10 +38,15 @@ setopt rematch_pcre # use perl regexp
 setopt noflowcontrol
 stty -ixon
 
 setopt noflowcontrol
 stty -ixon
 

-# populate path
+# populate path (order matters)

 typeset -U path     # make path a unique array
 typeset -U path     # make path a unique array

+# osx gnu utils (installed via brew)
+[[ -d /usr/local/opt/coreutils/libexec/gnubin ]] && path=(/usr/local/opt/coreutils/libexec/gnubin $path)
+[[ -d /usr/local/opt/findutils/libexec/gnubin ]] && path=(/usr/local/opt/findutils/libexec/gnubin $path)
+# personal scripts

 [[ -d ~/.local/bin ]] && path=(~/.local/bin $path)
 [[ -d ~/bin ]] && path=(~/bin $path)
 [[ -d ~/.local/bin ]] && path=(~/.local/bin $path)
 [[ -d ~/bin ]] && path=(~/bin $path)

+# android

 [[ -d /opt/android-sdk ]] && path=($path /opt/android-sdk/platform-tools)
 
 # source aliases
 [[ -d /opt/android-sdk ]] && path=($path /opt/android-sdk/platform-tools)
 
 # source aliases


@@ -56,6 +63,3 @@ hash -d chroot_testing=/buildsystem/testing/buildroot
 hash -d chroot_master=/buildsystem/master/buildroot
 hash -d chroot_lib32=/buildsystem/lib32/buildroot
 hash -d wineprefixes=/mnt/data/wineprefixes
 hash -d chroot_master=/buildsystem/master/buildroot
 hash -d chroot_lib32=/buildsystem/lib32/buildroot
 hash -d wineprefixes=/mnt/data/wineprefixes

-
-# set some env variables
-export _gamedir=/mnt/Skaro/Games/Linux/HumbleBundle