X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command_util.sh;h=a7f1b542a6532d0042af51e462ab264ee4f10e95;hp=a71bb6518f9194c999298e114b25636086d19ba8;hb=337d7784b0f8bc30b1fa9af56ace503acd97d40d;hpb=02691a995a6ee0fe4d9078f1d82465edd4814f74

diff --git a/command_util.sh b/command_util.sh
index a71bb651..a7f1b542 100755
--- a/command_util.sh
+++ b/command_util.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 
 read_header()
@@ -26,6 +26,12 @@ read_header()
 		AT:)
 			array_type="$value"
 			;;
+		SI:)
+			for i in $value; do
+				system_includes="$system_includes
+#include <$i.h>"
+			done
+			;;
 		IN:)
 			for i in $value; do
 				includes="$includes
@@ -137,12 +143,31 @@ ${line# }"
 
 dump_man()
 {
-	echo ".SS \"$name_txt\""
-	echo "$desc_txt"
-	echo
-	echo "\\fBusage: \\fP$usage_txt"
+	if test $template -eq 0; then
+		echo ".SS \"$name_txt\""
+		echo "$desc_txt"
+		echo
+		echo "\\fBUsage: \\fP$usage_txt"
+	else
+		for member in $template_members; do
+			local sed_cmd="sed -e s/@member@/$member/g"
+			local t_name_txt=$(echo $name_txt | $sed_cmd)
+			echo ".SS \"$t_name_txt\""
+		done
+		echo "$desc_txt" | sed -e "s/@member@/{$(echo $template_members | sed -e 's/ / | /g')}/g"
+		echo
+		echo "\\fBUsage: \\fP"
+		echo
+		echo ".nf"
+		for member in $template_members; do
+			local sed_cmd="sed -e s/@member@/$member/g"
+			local t_usage_txt=$(echo $usage_txt | $sed_cmd)
+			printf "\t$t_usage_txt\n"
+		done
+		echo ".fi"
+	fi
 	echo
-	echo "$help_txt"
+	echo "$help_txt" | sed -e 's/^	//'
 	echo
 	if test -n "$perms_txt"; then
 		echo -n "\\fBpermissions:\\fP "
@@ -222,7 +247,7 @@ dump_array_member()
 	echo ".description = \"$desc_txt\","
 	echo ".usage = \"$usage_txt\","
 	echo ".help = "
-	echo "$help_txt" | sed -e 's/^/\"/g' -e 's/$/\\n\"/g'
+	printf "%s\n" "$help_txt" | sed -e 's/^/\"/g' -e 's/$/\\n\"/g'
 	echo '},'
 }
 
@@ -244,7 +269,7 @@ template_loop()
 		perms_txt=$(echo $t_perms | $sed_cmd)
 		desc_txt=$(echo $t_desc | $sed_cmd)
 		usage_txt=$(echo $t_usage | $sed_cmd)
-		help_txt=$(echo $t_help | $sed_cmd)
+		help_txt=$(printf "%s\n" "$t_help" | $sed_cmd)
 		prototype=$(echo "$template_prototype" | $sed_cmd)
 		$1
 	done
@@ -254,6 +279,7 @@ template_loop()
 com_c_file()
 {
 	echo "/** \file $output_file.c $c_file_comment */"
+	echo "$system_includes"
 	echo "$includes"
 	echo "struct $array_type $array_name[] = {"
 	while : ; do