From 3b8777a6c6302dca8b8db4bb2bfc545f04733bd0 Mon Sep 17 00:00:00 2001 From: David Levine Date: Tue, 24 Apr 2012 14:23:44 -0500 Subject: [PATCH] Fixed to work with Solaris Bourne shell. --- docs/contrib/build_nmh | 11 ++++++++--- man/mh-chart-gen.sh | 24 +++++++++++++----------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh index 4405005..55a61c2 100755 --- a/docs/contrib/build_nmh +++ b/docs/contrib/build_nmh @@ -110,7 +110,9 @@ if [ $# -gt 0 ]; then fi #### Check to see that we're in a nmh source directory. -if ! grep 'the authors of nmh' COPYRIGHT >/dev/null; then +if grep 'the authors of nmh' COPYRIGHT >/dev/null; then + : +else echo "$0: not in nmh source directory" exit 1 fi @@ -205,7 +207,9 @@ if [ $yes -eq 0 ]; then read mts [ "$mts" ] && config_mts="$mts" - if [ ! "$mts" -o "$mts" = smtp ]; then + if [ "$mts" -o "$mts" = smtp ]; then + : + else printf 'SMTP server(s), space separated [%s]: ' $config_smtpservers read response servers=`echo $response | sed -e 's/ /\\\ /g'` @@ -324,7 +328,8 @@ if [ $status -eq 0 ]; then fi fi -grep -E 'Error|warn' $logfile +grep 'Error' $logfile +grep 'warn' $logfile [ $status -ne 0 ] && echo build failed! [ $status -eq 0 -a $verbose -ge 1 ] && echo build completed successfully diff --git a/man/mh-chart-gen.sh b/man/mh-chart-gen.sh index 33e2a4c..396327b 100755 --- a/man/mh-chart-gen.sh +++ b/man/mh-chart-gen.sh @@ -1,7 +1,7 @@ #! /bin/sh # -# Generates mh-chart.man from other .man files that have a -# SYNOPSIS section. +# Generates mh-chart.man from other .man files that have a SYNOPSIS +# section. nmhmandir=`dirname $0` @@ -17,15 +17,17 @@ mh-chart \- Chart of nmh Commands EOF for i in $nmhmandir/*.man; do - if ! echo $i | grep 'mh-chart.man' >/dev/null; then - if grep '^\.ad' "$i" >/dev/null; then - #### Extract lines from just after .SH SYNOPSIS to just before .ad. - #### Filter out the "typical usage:" section in pick.man. - awk '/.SH SYNOPSIS/,/^(\.ad|typical usage:)/' "$i" | \ - grep -Ev '^(\.SH SYNOPSIS|\.na|\.ad|typical usage:)' - echo - fi - fi + case $i in + */mh-chart.man) ;; + *) if grep '^\.ad' "$i" >/dev/null; then + #### Extract lines from just after .SH SYNOPSIS to just before .ad. + #### Filter out the "typical usage:" section in pick.man. + awk '/.SH SYNOPSIS/,/^(\.ad|typical usage:)/ { + if ($0 !~ /^(\.SH SYNOPSIS|\.na|\.ad|typical usage:)/) print + }' "$i" + echo + fi ;; + esac done cat <<'EOF' -- 1.7.10.4