From a515d87a0cd2b1f15848a19469083e3d43d31eda Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Tue, 17 Nov 2015 14:35:52 +0000 Subject: [PATCH] remove references to ~/local not using it any more --- .shared_env | 5 +---- .zshenv | 2 +- .zshrc | 7 +++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.shared_env b/.shared_env index a375d19..6c202d0 100644 --- a/.shared_env +++ b/.shared_env @@ -136,9 +136,6 @@ for dir in $ZDOTDIRREVPATH; do for newpath in \ $dir/sbin \ $dir/bin \ - $dir/local/$OSTYPE/bin \ - $dir/local/sbin \ - $dir/local/bin \ ; do if [ -d $newpath ]; then if [ -z "$newpaths" ]; then @@ -164,7 +161,7 @@ export PERL5LIB . $ZDOTDIR/.zsh/functions/enable_wordsplit newpaths= for dir in $ZDOTDIRREVPATH; do - for newpath in $dir/{local/,}lib/perl5{,/site_perl}; do + for newpath in $dir/lib/perl5{,/site_perl}; do if [ -d $newpath ]; then : #echo got $newpath if [ -z "$newpaths" ]; then diff --git a/.zshenv b/.zshenv index 2bd3d10..cec1309 100644 --- a/.zshenv +++ b/.zshenv @@ -80,7 +80,7 @@ rubylib=( typeset -TU PYTHONPATH pythonpath export PYTHONPATH pythonpath=( - ~/{local/,}lib{,64}/[p]ython{2*,}{/site-packages,}(N) + ~/lib{,64}/[p]ython{2*,}{/site-packages,}(N) $pythonpath ) diff --git a/.zshrc b/.zshrc index a0396d3..18ad55e 100755 --- a/.zshrc +++ b/.zshrc @@ -168,9 +168,8 @@ sh_load_status 'setting environment' typeset -U infopath # no duplicates export INFOPATH infopath=( - ~/local/$OSTYPE/{share/,}info(N) - ~/{local/,}{share/,}info(N) - /usr/{local/,}{share/,}info(N) + ~/{share/,}info(N) + /usr/{share/,}info(N) $infopath ) @@ -204,7 +203,7 @@ esac # Add extra paths to path determined by /etc/man.config MANPATH="`MANPATH= manpath`" manpath=( - $ZDOTDIR/{local/,}share/[m]an(N) + $ZDOTDIR/share/[m]an(N) "$manpath[@]" )