_bash_profile_addpath(): Prevent multiplication of the elements.

Call perl(1) just once.
tohex(): Fixed.

diff --git a/.bashrc b/.bashrc
index ab9b1f4..289d2e3 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -20,7 +20,7 @@ if [ -f /etc/bashrc ];then source /etc/bashrc;fi
 
 function _bash_profile_addpath # <variablename>,<dirpathname>
 {
-       local _varname _dirpathname _opt_f _opt_s
+       local _varname _varval _varvalold _dirpathname _opt_f _opt_s
        _opt_f=0;_opt_s=0
        unset OPTIND
        while getopts fs got;do
@@ -35,8 +35,14 @@ function _bash_profile_addpath       # <variablename>,<dirpathname>
        if [ $_opt_s = 1 -o -z "`eval "echo \\${$_varname}"`" ];then
                eval "$_varname='$_dirpathname'"
        else
-               # we want to override any original directories, place dirpathname first!
-               eval "$_varname=\"$_dirpathname:\${$_varname}\""
+               # We want to override any original directories, place dirpathname first!
+               # We want to prevent duplicates due to .bashrc reentrancy across fork(2)s.
+               eval "_varval=\":\${$_varname}:\""
+               until [ "$_varval" = "$_varvalold" ];do
+                       _varvalold="$_varval"
+                       eval "_varval=\"$(echo "$_varval"|sed "s#:$_dirpathname:#:#g")\""
+               done
+               eval "$_varname=\"$_dirpathname$(echo "$_varval"|sed "s#:\$##g")\""
        fi
        export "$_varname"
 }
@@ -83,13 +89,8 @@ _bash_profile_addpath    -s ANT_HOME "/usr/local/ant"
 # /lib/perl for Debian
 # /lib/perl5 for Fedora Core
 mkdir -p $HOME/lib/perl5       # otherwise CPAN will install to "$HOME/lib/site_perl" etc.
-for _perldir in $(eval "echo {/usr,$HOME}{/lib/perl5,/share/perl,/lib/perl}{,/site_perl}$(
-       for perlvar in version archname;do
-               echo -n '{,/'
-               perl -V:"$perlvar"|cut -d "'" -f 2|tr -d '\n'
-               echo -n '}'
-               done
-       )");do
+_perlpatt="$(perl -MConfig -e 'print "{,/".$Config{$_}."}" for qw(version archname);')"
+for _perldir in $(eval "echo {/usr,$HOME}{/lib/perl5,/share/perl,/lib/perl}{,/site_perl}$_perlpatt");do
        _bash_profile_addpath -f PERLLIB "$_perldir"
        done
 unset _perldir
@@ -187,7 +188,7 @@ function finame { find . -false `
 function mkcd { mkdir -p "$1"; cd "$1"; }; export -f mkcd
 function pushdmk { mkdir -p "$1"; pushd "$1"; }; export -f pushdmk
 function rsync {(unset rsync; rsync -v -e ssh --progress --stats --partial --block-size=512 "$@"; );}; export -f rsync
-function tohex { od -An -txC /tmp/out|tr -d '\n '|tr 'a-f' 'A-F';echo; }; export -f tohex
+function tohex { od -An -txC|tr -d '\n '|tr 'a-f' 'A-F';echo; }; export -f tohex
 function edall {
        find -type f|while read -r i;do
                (awk </dev/null 'BEGIN{ for (i=1;i<ARGC;i++) print ARGV[i]; }' "$@";echo -e 'w\nq')|ed -s "$i"