X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/9a3fa88e036c5cf72051a9f289d3b4f28f38c5f6..a203fba87fe2b0d9be2c1da7b55a6eb6ca46766b:/bashrc?ds=sidebyside diff --git a/bashrc b/bashrc index 6fb97f4..a172640 100644 --- a/bashrc +++ b/bashrc @@ -1,3 +1,4 @@ +# -*-sh-*- # # $Id: .bashrc,v 1.6 1996/12/08 20:33:42 mdw Exp $ # @@ -174,6 +175,104 @@ core () { esac } +# --- Turning on and off path hacks --- + +path-add () { + local pathvar export dir val + case $# in + 1) pathvar=PATH dir=$1 export="export PATH";; + 2) pathvar=$1 dir=$2 export=:;; + *) echo >&2 "Usage: $0 [VAR] DIR";; + esac + eval "val=\$$pathvar" + case ":$val:" in + *:"$dir":*) ;; + *) val=$dir:$val ;; + esac + eval "$pathvar=\$val" + $export +} + +path-remove () { + local pathvar export dir val + case $# in + 1) pathvar=PATH dir=$1 export="export PATH";; + 2) pathvar=$1 dir=$2 export=:;; + *) echo >&2 "Usage: $0 [VAR] DIR";; + esac + eval "val=\$$pathvar" + case ":$val:" in + :"$dir":) val= ;; + :"$dir":*) val=${val#$dir:} ;; + *:"$dir":) val=${val%:$dir} ;; + *:"$dir":*) val=${val/:$dir:/:} ;; + esac + eval "$pathvar=\$val" + $export +} + +pathhack () { + if [ $# -eq 0 ]; then + local IFS=: + for e in $PATH; do + case "$e" in + "$HOME/bin/hacks/"*) + echo ${e#$HOME/bin/hacks/} + ;; + esac + done + return + fi + local force=nil + local path=$PATH + while [ $# -gt 0 ]; do + arg=$1 + case "$arg" in + -f | --force) + force=t + shift + continue + ;; + --) + shift + break + ;; + [-+]*) + ;; + *) + break + ;; + esac + hack=${arg#[+-]} + dir=$HOME/bin/hacks/$hack + [ -d "$dir" ] || { + echo "$0: path hack $hack not found" + return 1 + } + case "$arg,$force,:$PATH:" in + -*,*,*:"$dir":*) + path-remove path "$dir" + ;; + +*,t,*:"$dir":*) + path-remove path "$dir" + path-add path "$dir" + ;; + +*,nil,*:"$dir":*) + ;; + +*,*) + path-add path "$dir" + ;; + esac + shift + done + if [ $# -eq 0 ]; then + PATH=$path + export PATH + else + PATH=$path "$@" + fi +} + # --- Fix `man' under Slowaris --- case "$MACHTYPE" in @@ -199,4 +298,6 @@ if (( UID == 0 )); then set -o noclobber fi +[ -f "$HOME/.bashrc-local" ] && . "$HOME/.bashrc-local" + fi