# HG changeset patch # User Aleksej Bobylev # Date 1338734369 0 # Node ID bbdd70de8552766d64fbe0ea29341fd02a8c3c5c # Parent d4df77afbed67f86a280af36ad4e98fda692b0ee man: fixed diff -r d4df77afbed6 -r bbdd70de8552 rootfs/usr/bin/man --- a/rootfs/usr/bin/man Sun Jun 03 14:09:18 2012 +0000 +++ b/rootfs/usr/bin/man Sun Jun 03 14:39:29 2012 +0000 @@ -25,11 +25,7 @@ case "$1" in ''|-*) - cat <Usage: man [section] command')" - -EOT + emsg "$(gettext 'Usage: man [section] command')" return ;; esac @@ -59,12 +55,14 @@ fi for i in /usr/share/man/$LC_ALL/man$MAN_SECTION /usr/share/man/man$MAN_SECTION; do - if [ -f $i/raw-$TOPIC.* ]; then - i=$(ls $i/raw-$TOPIC.*) - case "$i" in - *gz) (zcat $i || unlzma -c $i 2> /dev/null) | less -M;; - *) less -M $i;; - esac + if [ -f $i/$TOPIC.* ]; then + i=$(ls $i/$TOPIC.* 2> /dev/null) + if [ "x$i" != "x" ]; then + case "$i" in + *gz) (zcat $i || unlzma -c $i 2> /dev/null) | less -M;; + *) less -M $i;; + esac + fi return fi if [ -x /usr/bin/retawq -a -f $i/$TOPIC.html ]; then @@ -73,6 +71,7 @@ fi done +[ "x$SECTION" = "x" ] && SECTION="all" (wget -O - "http://mirror.slitaz.org/man/$SECTION/$TOPIC.html" || \ wget -O - "http://man.he.net/?topic=$TOPIC§ion=$SECTION") 2> /dev/null | \ awk "BEGIN { s=0; n=0 } /
/ { s=1 } { if (s) { print; n++} } /<\/PRE>/ { s=0 } END { if (n == 0) print \"$(eval_gettext 'No manual entry for $TOPIC$MSG')\" }" | \