INN commit: trunk (3 files)

INN Commit Russ_Allbery at isc.org
Thu Jan 8 19:47:24 UTC 2009


    Date: Thursday, January 8, 2009 @ 11:47:24
  Author: iulius
Revision: 8278

Use the "-n" option with head and tail (already used in config.guess).

Modified:
  trunk/backends/actsyncd.in
  trunk/m4/perl.m4
  trunk/support/fixscript.in

----------------------+
 backends/actsyncd.in |   10 +++++-----
 m4/perl.m4           |    2 +-
 support/fixscript.in |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

Modified: backends/actsyncd.in
===================================================================
--- backends/actsyncd.in	2009-01-08 19:17:55 UTC (rev 8277)
+++ backends/actsyncd.in	2009-01-08 19:47:24 UTC (rev 8278)
@@ -51,23 +51,23 @@
 
 # parse config_file
 #
-host="`sed -n -e 's/^host=[ 	]*//p' $cfg | tail -1`"
+host="`sed -n -e 's/^host=[ 	]*//p' $cfg | tail -n -1`"
 if [ -z "$host" ]; then
     echo "$0: no host specified in $cfg" 1>&2
     exit 3
 fi
-flags="`sed -n -e 's/^flags=[ 	]*//p' $cfg | tail -1`"
+flags="`sed -n -e 's/^flags=[ 	]*//p' $cfg | tail -n -1`"
 if [ -z "$flags" ]; then
     echo "$0: no flags specified in $cfg" 1>&2
     exit 4
 fi
-ign="`sed -n -e 's/^ignore_file=[ 	]*//p' $cfg | tail -1`"
+ign="`sed -n -e 's/^ignore_file=[ 	]*//p' $cfg | tail -n -1`"
 if [ -z "$ign" ]; then
     echo "$0: no ignore file specified in $cfg" 1>&2
     exit 5
 fi
-ftp="`sed   -n -e 's/^ftppath=[ 	]*//p' $cfg | tail -1`"
-spool="`sed -n -e 's/^spool=[ 	]*//p' $cfg | tail -1`"
+ftp="`sed   -n -e 's/^ftppath=[ 	]*//p' $cfg | tail -n -1`"
+spool="`sed -n -e 's/^spool=[ 	]*//p' $cfg | tail -n -1`"
 if [ -z "$spool" ]; then
     spool=$SPOOL
     #echo "$0: no spool directory specified in $cfg" 1>&2

Modified: m4/perl.m4
===================================================================
--- m4/perl.m4	2009-01-08 19:17:55 UTC (rev 8277)
+++ m4/perl.m4	2009-01-08 19:47:24 UTC (rev 8278)
@@ -58,7 +58,7 @@
     AC_MSG_CHECKING([for Perl linkage])
     inn_perl_core_path=`$PERL -MConfig -e 'print $Config{archlibexp}'`
     inn_perl_core_flags=`$PERL -MExtUtils::Embed -e ccopts`
-    inn_perl_core_libs=`$PERL -MExtUtils::Embed -e ldopts 2>&1 | tail -1`
+    inn_perl_core_libs=`$PERL -MExtUtils::Embed -e ldopts 2>&1 | tail -n -1`
     inn_perl_core_libs=" $inn_perl_core_libs "
     inn_perl_core_libs=`echo "$inn_perl_core_libs" | sed 's/ -lc / /'`
     for i in $LIBS ; do

Modified: support/fixscript.in
===================================================================
--- support/fixscript.in	2009-01-08 19:17:55 UTC (rev 8277)
+++ support/fixscript.in	2009-01-08 19:47:24 UTC (rev 8278)
@@ -56,7 +56,7 @@
     exit 1
 fi
 
-interpretor=`head -1 "$input"`
+interpretor=`head -n -1 "$input"`
 case "$interpretor" in
 */sh|*SH*)
     path="/bin/sh"




More information about the inn-committers mailing list