From: Alexander Barton <alex@barton.de>
Date: Sat, 21 Aug 2010 11:41:00 +0000 (+0200)
Subject: Only setup MANPATH if manpath(1) is not available
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ebd683d576a2d8ffb20ad4a23943b22f6d7134c;p=ConfigScripts.git

Only setup MANPATH if manpath(1) is not available
---

diff --git a/sys/profile b/sys/profile
index 30e0df1..e673b01 100644
--- a/sys/profile
+++ b/sys/profile
@@ -50,16 +50,18 @@ done
 [ -d ~/bin ] && PATH=~/bin:"${PATH}"
 [ -d ~/sbin ] && PATH=~/sbin:"${PATH}"
 
-# set MANPATH so it includes user's private man files
-if [ -n "$MANPATH" ]; then
+# Setup MANPATH, if manpath(1) isn't available
+if [ ! "$(type manpath)" ]; then
+	[ -z "$MANPATH" ] \
+		&& MANPATH="/usr/local/share/man:/usr/share/man:/usr/man"
 	path=""
 	for d in /usr/pkg/share/man /usr/pkg/man /opt/*/share/man /opt/*/man; do
 		[ -d "$d" -o -h "$d" ] && path="$path$d:"
 	done
 	[ -n "$path" ] && MANPATH="$path$MANPATH"
+	[ -d ~/share/man ] && MANPATH=~/share/man:"${MANPATH}"
+	[ -d ~/man ] && MANPATH=~/man:"${MANPATH}"
 fi
-[ -d ~/man ] && MANPATH=~/man:"${MANPATH}"
-[ -d ~/share/man ] && MANPATH=~/share/man:"${MANPATH}"
 
 # set variable identifying the chroot you work in
 [ -r /etc/debian_chroot ] && chroot_name=$(cat /etc/debian_chroot)