slitaz-base-files rev 194

man: fixed
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sun Jun 03 14:39:29 2012 +0000 (2012-06-03)
parents d4df77afbed6
children fd29fd846069
files rootfs/usr/bin/man
line diff
     1.1 --- a/rootfs/usr/bin/man	Sun Jun 03 14:09:18 2012 +0000
     1.2 +++ b/rootfs/usr/bin/man	Sun Jun 03 14:39:29 2012 +0000
     1.3 @@ -25,11 +25,7 @@
     1.4  
     1.5  case "$1" in
     1.6  	''|-*)
     1.7 -		cat <<EOT
     1.8 -
     1.9 -emsg "$(gettext '<b>Usage:</b> man [section] command')"
    1.10 -
    1.11 -EOT
    1.12 +		emsg "$(gettext '<b>Usage:</b> man [section] command')"
    1.13  		return ;;
    1.14  esac
    1.15  
    1.16 @@ -59,12 +55,14 @@
    1.17  fi
    1.18  
    1.19  for i in /usr/share/man/$LC_ALL/man$MAN_SECTION /usr/share/man/man$MAN_SECTION; do
    1.20 -	if [ -f $i/raw-$TOPIC.* ]; then
    1.21 -		i=$(ls $i/raw-$TOPIC.*)
    1.22 -		case "$i" in
    1.23 -		*gz) (zcat $i || unlzma -c $i 2> /dev/null) | less -M;;
    1.24 -		*) less -M $i;;
    1.25 -		esac
    1.26 +	if [ -f $i/$TOPIC.* ]; then
    1.27 +		i=$(ls $i/$TOPIC.* 2> /dev/null)
    1.28 +		if [ "x$i" != "x" ]; then
    1.29 +			case "$i" in
    1.30 +				*gz) (zcat $i || unlzma -c $i 2> /dev/null) | less -M;;
    1.31 +				*) less -M $i;;
    1.32 +			esac
    1.33 +		fi
    1.34  		return
    1.35  	fi
    1.36  	if [ -x /usr/bin/retawq -a -f $i/$TOPIC.html ]; then
    1.37 @@ -73,6 +71,7 @@
    1.38  	fi
    1.39  done
    1.40  
    1.41 +[ "x$SECTION" = "x" ] && SECTION="all"
    1.42  (wget -O - "http://mirror.slitaz.org/man/$SECTION/$TOPIC.html" || \
    1.43  	wget -O - "http://man.he.net/?topic=$TOPIC&section=$SECTION") 2> /dev/null | \
    1.44  	awk "BEGIN { s=0; n=0 } /<PRE>/ { s=1 } { if (s) { print; n++} } /<\/PRE>/ { s=0 } END { if (n == 0) print \"$(eval_gettext 'No manual entry for $TOPIC$MSG')\" }" | \