Fix pathing again.

This commit is contained in:
Roy Marples 2008-03-20 19:57:31 +00:00
parent e598b7d2cd
commit 04b0acb010

View File

@ -62,22 +62,19 @@ if [ -n "${ZSH_VERSION}" ]; then
fi fi
# Make a sane PATH # Make a sane PATH
_PREFIX=@PREFIX@
_PKG_PREFIX=@PKG_PREFIX@ _PKG_PREFIX=@PKG_PREFIX@
_LOCAL_PREFIX=@LOCAL_PREFIX@ _LOCAL_PREFIX=@LOCAL_PREFIX@
_PATH=@PREFIX@/lib/rc/bin:@PREFIX@/bin:@PREFIX@/sbin _LOCAL_PREFIX=${_LOCAL_PREFIX:-/usr/local}
case "${_PREFIX}" in _PATH=@PREFIX@/lib/rc/bin:/bin:/sbin:/usr/bin:/usr/sbin
""|/) _PATH="${_PATH}:/usr/bin:/usr/sbin";;
/usr) _PATH="${_PATH}:/bin:/sbin";;
*) _PATH="${_PATH}:/bin:/sbin:/usr/bin:/usr/sbin";;
esac
if [ -n "${_PKG_PREFIX}" ]; then if [ -n "${_PKG_PREFIX}" ]; then
_PATH="${_PATH}:${_PKG_PREFIX}/bin:${_PKG_PREFIX}/sbin" _PATH="${_PATH}:${_PKG_PREFIX}/bin:${_PKG_PREFIX}/sbin"
fi fi
if [ -n "${_LOCAL_PREFIX}" ]; then if [ -n "${_LOCAL_PREFIX}" ]; then
_PATH="${_PATH}:${_LOCAL_PREFIX}/bin:${_LOCAL_PREFIX}/sbin" _PATH="${_PATH}:${_LOCAL_PREFIX}/bin:${_LOCAL_PREFIX}/sbin"
fi fi
export PATH="${_PATH}$(_sanitize_path "${PATH}")" export PATH="${_PATH}:$(_sanitize_path "${PATH}")"
unset _sanitize_path _PKG_PREFIX _LOCAL_PREFIX _PATH unset _sanitize_path _PREFIX _PKG_PREFIX _LOCAL_PREFIX _PATH
for arg; do for arg; do
case "${arg}" in case "${arg}" in