X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/a5fa0e5f71ef5cc1b0ea24ea2f778835ba366ed1..refs/heads/master:/zshrc

diff --git a/zshrc b/zshrc
index d7112b9..e2dba1a 100644
--- a/zshrc
+++ b/zshrc
@@ -6,6 +6,22 @@ ZSH_CACHE=$XDG_CACHE_HOME/zsh
 [[ ! -d "$ZSH_CACHE" ]] && echo "Missing cache dir: '$ZSH_CACHE'" && return
 [[ ! -d "$ZSH_DATA" ]]  && echo "Missing data dir: '$ZSH_DATA'"   && return
 
+# populate path (order matters)
+typeset -U path     # make path a unique array
+# osx gnu utils (installed via brew)
+if (( $+commands[brew] )); then
+    for pkg in coreutils findutils gnu-sed make; do
+        [[ -d $(brew --prefix $pkg)/libexec/gnubin ]] && path=($(brew --prefix $pkg)/libexec/gnubin $path)
+    done
+fi
+# osx pip 3.7 install
+[[ -d ~/Library/Python/3.7/bin ]] && path=(~/Library/Python/3.7/bin $path)
+# personal scripts
+[[ -d ~/.local/bin ]] && path=(~/.local/bin $path)
+[[ -d ~/bin ]] && path=(~/bin $path)
+# android
+[[ -d /opt/android-sdk ]] && path=($path /opt/android-sdk/platform-tools)
+
 # load my functions
 typeset -U fpath    # make fpath a unique array
 [[ -d $ZSH/functions ]] && fpath=($ZSH/functions $fpath)
@@ -38,20 +54,6 @@ setopt rematch_pcre # use perl regexp
 setopt noflowcontrol
 stty -ixon
 
-# populate path (order matters)
-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)
-[[ -d /usr/local/opt/gnu-sed/libexec/gnubin ]] && path=(/usr/local/opt/gnu-sed/libexec/gnubin $path)
-# osx pip 3.7 install
-[[ -d ~/Library/Python/3.7/bin ]] && path=(~/Library/Python/3.7/bin $path)
-# personal scripts
-[[ -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
 [[ -f $XDG_CONFIG_HOME/aliases ]] && source $XDG_CONFIG_HOME/aliases
 for alias_file ($ZSH/aliases/*.zsh); do
@@ -60,16 +62,8 @@ done
 
 # set up a few named directories
 hash -d fook=/mnt/fook
-hash -d ccr=~/ccr
 hash -d src=~/src
-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
 
 # fpp named dirs
+hash -d evk=~/src/fpp/evk
 hash -d fpp=~/src/fpp
-hash -d rap_tests=/mnt/fpp_brs/gitlab_data/rap/tests
-
-# add check_copyright to path
-path+=(~/src/fpp/check_copyright)