INN commit: trunk/support (fixconfig.in)

INN Commit Russ_Allbery at isc.org
Sun May 17 08:25:35 UTC 2009


    Date: Sunday, May 17, 2009 @ 01:25:35
  Author: iulius
Revision: 8471

* Use a global sed replacement.

* '\@' is not portable according to Posix.  Use '[@]' instead.

Modified:
  trunk/support/fixconfig.in

--------------+
 fixconfig.in |   38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

Modified: fixconfig.in
===================================================================
--- fixconfig.in	2009-05-16 12:59:08 UTC (rev 8470)
+++ fixconfig.in	2009-05-17 08:25:35 UTC (rev 8471)
@@ -48,28 +48,28 @@
 
 output="$2"
 if [ -z "$output" ] ; then
-    output=`echo "$input" | sed 's/\.in$//'`
+    output=`echo "$input" | $SED -e 's/\.in$//'`
 fi
 if [ x"$input" = x"$output" ] ; then
     echo "No output file specified and input file doesn't end in .in" >&2
     exit 1
 fi
 
-$SED -e "s, at prefix\@,$prefix," \
-     -e "s, at bindir\@,$bindir," \
-     -e "s, at libexecdir\@,$libexecdir," \
-     -e "s, at libdir\@,$libdir," \
-     -e "s, at sbindir\@,$sbindir," \
-     -e "s, at sysconfdir\@,$sysconfdir," \
-     -e "s, at CONTROLDIR\@,$CONTROLDIR," \
-     -e "s, at DBDIR\@,$DBDIR," \
-     -e "s, at FILTERDIR\@,$FILTERDIR," \
-     -e "s, at HTTPDIR\@,$HTTPDIR," \
-     -e "s, at LIBPERLDIR\@,$LIBPERLDIR," \
-     -e "s, at LOGDIR\@,$LOGDIR," \
-     -e "s, at RUNDIR\@,$RUNDIR," \
-     -e "s, at SPOOLDIR\@,$SPOOLDIR," \
-     -e "s, at tmpdir\@,$tmpdir," \
-     -e "s, at DO_PGPVERIFY\@,$DO_PGPVERIFY," \
-     -e "s, at HOSTNAME\@,$HOSTNAME," \
-     -e "s, at SENDMAIL\@,$SENDMAIL," < "$input" > "$output"
+$SED -e "s, at prefix[@],$prefix,g" \
+     -e "s, at bindir[@],$bindir,g" \
+     -e "s, at libexecdir[@],$libexecdir,g" \
+     -e "s, at libdir[@],$libdir,g" \
+     -e "s, at sbindir[@],$sbindir,g" \
+     -e "s, at sysconfdir[@],$sysconfdir,g" \
+     -e "s, at CONTROLDIR[@],$CONTROLDIR,g" \
+     -e "s, at DBDIR[@],$DBDIR,g" \
+     -e "s, at FILTERDIR[@],$FILTERDIR,g" \
+     -e "s, at HTTPDIR[@],$HTTPDIR,g" \
+     -e "s, at LIBPERLDIR[@],$LIBPERLDIR,g" \
+     -e "s, at LOGDIR[@],$LOGDIR,g" \
+     -e "s, at RUNDIR[@],$RUNDIR,g" \
+     -e "s, at SPOOLDIR[@],$SPOOLDIR,g" \
+     -e "s, at tmpdir[@],$tmpdir,g" \
+     -e "s, at DO_PGPVERIFY[@],$DO_PGPVERIFY,g" \
+     -e "s, at HOSTNAME[@],$HOSTNAME,g" \
+     -e "s, at SENDMAIL[@],$SENDMAIL,g" < "$input" > "$output"




More information about the inn-committers mailing list