diff options
| -rwxr-xr-x | etc/periodic/weekly/320.whatis | 10 | ||||
| -rwxr-xr-x | etc/periodic/weekly/330.catman | 10 |
2 files changed, 4 insertions, 16 deletions
diff --git a/etc/periodic/weekly/320.whatis b/etc/periodic/weekly/320.whatis index cab4376aa4b4..34363318698b 100755 --- a/etc/periodic/weekly/320.whatis +++ b/etc/periodic/weekly/320.whatis @@ -13,19 +13,13 @@ if [ -x /usr/libexec/makewhatis.local -a -x /usr/bin/manpath ]; then if [ "x${MANPATH}" = "x" ]; then echo "manpath failed to find any manpage directories" else - # If possible, check global system configuration file - # for additional man(1) locales installed - if [ -r /etc/defaults/rc.conf ]; then - . /etc/defaults/rc.conf - elif [ -r /etc/rc.conf ]; then - . /etc/rc.conf - fi + man_locales=`/usr/bin/manpath -qL` # Build whatis(1) database(s) for original, non-localized manpages. /usr/libexec/makewhatis.local "${MANPATH}" # Build whatis(1) database(s) for localized manpages. - if [ "x${man_locales}" != "x" -a "${man_locales}" != "NO" ]; then + if [ X"${man_locales}" != X ]; then for i in ${man_locales} do LC_CTYPE=$i /usr/libexec/makewhatis.local -a -L "${MANPATH}" diff --git a/etc/periodic/weekly/330.catman b/etc/periodic/weekly/330.catman index bb70e32e37d2..a2a6a8ee8e2a 100755 --- a/etc/periodic/weekly/330.catman +++ b/etc/periodic/weekly/330.catman @@ -16,19 +16,13 @@ if [ -x /usr/libexec/catman.local \ if [ "x${MANPATH}" = "x" ]; then echo "manpath failed to find any manpath directories" else - # If possible, check global system configuration file - # for additional man(1) locales installed - if [ -r /etc/defaults/rc.conf ]; then - . /etc/defaults/rc.conf - elif [ -r /etc/rc.conf ]; then - . /etc/rc.conf - fi + man_locales=`/usr/bin/manpath -qL` # Preformat original, non-localized manpages echo /usr/libexec/catman.local "${MANPATH}" | su -fm man # Preformat localized manpages. - if [ "x${man_locales}" != "x" -a "${man_locales}" != "NO" ]; then + if [ X"${man_locales}" != X ]; then for i in ${man_locales} do LC_CTYPE=$i echo /usr/libexec/catman.local -L "${MANPATH}" | \ |