Commit Diff


commit - 9cf786bd3290ba08b506caed9401a4f1c305fbdd
commit + b922200e0e347dfefce48245e3346837c9c50749
blob - 5115c182df11c9d6fb7b5ba709d4ada18a8e52d4
blob + ecb9a3aa47699b9fa699bbab1265c40bebb0acd4
--- readman
+++ readman
@@ -6,7 +6,7 @@ men=$HOME/.manread
 
 cleanup() {
 	[ -w "$mymen" ] && rm -f "$mymen"
-	[ -w "$allmen" ] && rm -f "$sysmen"
+	[ -w "$allmen" ] && rm -f "$allmen"
 }
 
 usage() {
@@ -48,10 +48,10 @@ diffhash() {
 secstats() {
 	nchanged=0
 	diffhash "$1"
-	printf '* man %s: %s/%s' "$1" $nread $nall
+	printf '* man %s: %s/%s' "$1" "$nread" "$nall"
 	if [ -n "$changed" ]; then
 		nchanged="$(echo "$changed" | tr ' ' '\n' | wc -l)"
-		printf '\t(%s changed)' $nchanged
+		printf '\t(%s changed)' "$nchanged"
 	fi
 	echo
 }
@@ -75,8 +75,8 @@ done
 shift $((OPTIND - 1))
 $aflag && $dflag && usage
 
-[ -f $men ] || touch $men
-[ -r $men ] || err "unable to read ${men}!"
+[ -f "$men" ] || touch "$men"
+[ -r "$men" ] || err "unable to read ${men}!"
 mymen=$(echo 'mkstemp(/tmp/readman.XXXXXXXXXX)' | m4)
 allmen=$(echo 'mkstemp(/tmp/readman.XXXXXXXXXX)' | m4)
 case $# in
@@ -94,27 +94,24 @@ case $# in
 1)
 	sec=$1
 
-	if $aflag || ! issec "$sec"
-	then
+	if $aflag || ! issec "$sec"; then
 		usage
-	elif $dflag && prompt "Do you really want to delete all stats for section ${sec}?"
-	then
+	elif $dflag && prompt "Do you really want to delete all stats for section ${sec}?"; then
 		printf 'g/%s/d\nwq\n' "$sec" | ed - "$men"
 	else 
 		secstats "$sec"
-                [ "$nchanged" -gt 0 ] && echo "* to reread:" $(diffmen "$sec")
-		awk "/^${1}/"'{print $2 }' "$men" >"$mymen"
+                [ "$nchanged" -gt 0 ] && echo "* to reread: $(diffmen "$sec" | tr '\n' ' ')"
+		awk "/^${1}/"'{ print $2 }' "$men" >"$mymen"
 		man -ws "$1" -k . | awk -F/ '{ split($NF, a, /\.[1-9]/); print a[1] }' >"$allmen"
-                if [ "$nread" -gt 0 ]; then
-                        echo "* have read:" $(comm -12 "$mymen" "$allmen")
-		fi
-                echo "* to read:" $(comm -13 "$mymen" "$allmen")
+                [ "$nread" -gt 0 ] && 
+                        echo "* have read: $(comm -12 "$mymen" "$allmen" | tr '\n' ' ')"
+                echo "* to read: $(comm -13 "$mymen" "$allmen" | tr '\n' ' ')"
 	fi
 	;;
 2)
 	sec=$1
 	page=$2
-	mantitle="$page($sec)"
+	mantitle="${page}(${sec})"
 
 	if ! issec "$sec"; then
 		usage