X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=subcommand;h=34553b808970e92ae29f5f2dbce060c1cc2f6ae7;hb=7118adb657e4baaa35515622057fc79a60788992;hp=fe6ec57d66ae852562c23a20f0bca9b4a2464a75;hpb=a67f16ae830226c7afef2f3fad72efe46f3b5ed9;p=gsu.git

diff --git a/subcommand b/subcommand
index fe6ec57..34553b8 100644
--- a/subcommand
+++ b/subcommand
@@ -209,7 +209,7 @@ gsu_complete_options()
 
 com_prefs_options='e'
 
-export gsu_prefs_txt="
+_gsu_prefs_txt="
 Print the current preferences.
 
 Usage: prefs [-e]
@@ -255,35 +255,47 @@ com_prefs()
 			printf "# optional"
 			;;
 		esac
-		printf " $option_type: $description"
+		printf "%s: %s" "$option_type" "$description"
 		if [[ "$required" != "yes" && "$required" != "true" ]]; then
-			printf " [$default_value]"
+			printf " [%s]" "$default_value"
 		fi
 		echo
 		[[ -n "$help_text" ]] && sed -e '/^[	]*$/d; s/^[ 	]*/#	/g' <<< "$help_text"
-		printf "$name=$val"
+		printf "%s=%s" "$name" "$val"
 		[[ "$val" == "$default_value" ]] && printf " # default"
 		echo
 	done
 }
 
+_gsu_isatty()
+{(
+	exec 3<&1
+	stty 0<&3 &> /dev/null
+)}
+
 complete_prefs()
 {
 	gsu_complete_options "$com_prefs_options" "$@"
 }
 
-export gsu_man_txt="
+_gsu_man_txt='
 Print the manual.
 
-Usage: man"
+Usage: man
 
+If stdout associated with a terminal device, output is piped to
+$PAGER. If $PAGER is unset, less(1) is assumed.
+'
 
 com_man()
 {
 	local equal_signs="=================================================="
 	local minus_signs="--------------------------------------------------"
-	local com num
+	local com num pager='cat'
 
+	_gsu_isatty && pager="${PAGER:-less}"
+	[[ "$pager" == 'less' ]] && export LESS=${LESS-RI}
+	{
 	echo "$gsu_name (_${gsu_banner_txt}_) manual"
 	echo "${equal_signs:0:${#gsu_name} + ${#gsu_banner_txt} + 16}"
 	echo
@@ -311,10 +323,11 @@ com_man()
 		$0 help $com
 		echo
 	done
+	} | $pager
 	ret=$GSU_SUCCESS
 }
 
-export gsu_help_txt="
+_gsu_help_txt="
 Print online help.
 
 Usage: help [command]
@@ -322,7 +335,7 @@ Usage: help [command]
 Without arguments, print the list of available commands. Otherwise,
 print the help text for the given command."
 
-export gsu_complete_txt="
+_gsu_complete_txt="
 Command line completion.
 
 Usage: complete [<cword> <word>...]
@@ -338,7 +351,7 @@ the subcommand.
 
 com_help()
 {
-	local a b ere tab='	'
+	local ere tab='	'
 
 	_gsu_get_command_regex
 	ere="$result"
@@ -347,11 +360,11 @@ com_help()
 		gsu_short_msg "### $gsu_name -- $gsu_banner_txt ###"
 		_gsu_usage 2>&1
 		{
-			printf "com_help()\n$gsu_help_txt" | head -n 4; echo "--"
-			printf "com_man()\n$gsu_man_txt" | head -n 4; echo "--"
-			printf "com_prefs()\n$gsu_prefs_txt" | head -n 4; echo "--"
-			printf "com_complete()\n$gsu_complete_txt" | head -n 4; echo "--"
-			grep -EA 2 "$ere" $0
+			printf "com_help()\n%s" "$_gsu_help_txt" | head -n 4; echo "--"
+			printf "com_man()\n%s" "$_gsu_man_txt" | head -n 4; echo "--"
+			printf "com_prefs()\n%s" "$_gsu_prefs_txt" | head -n 4; echo "--"
+			printf "com_complete()\n%s" "$_gsu_complete_txt" | head -n 4; echo "--"
+			grep -EA 2 "$ere" "$0"
 		} | grep -v -- '--' \
 			| sed -En "/$ere/"'!d
 				# remove everything but the command name
@@ -379,22 +392,22 @@ com_help()
 		return
 	fi
 	if test "$1" = "help"; then
-		echo "$gsu_help_txt"
+		echo "$_gsu_help_txt"
 		ret=$GSU_SUCCESS
 		return
 	fi
 	if test "$1" = "man"; then
-		echo "$gsu_man_txt"
+		echo "$_gsu_man_txt"
 		ret=$GSU_SUCCESS
 		return
 	fi
 	if test "$1" = "prefs"; then
-		echo "$gsu_prefs_txt"
+		echo "$_gsu_prefs_txt"
 		ret=$GSU_SUCCESS
 		return
 	fi
 	if test "$1" = "complete"; then
-		echo "$gsu_complete_txt"
+		echo "$_gsu_complete_txt"
 		ret=$GSU_SUCCESS
 		return
 	fi