Mercurial > masqmail
diff admin/config-transition @ 311:e230bcd0f1c6
removed protocol option from route config
It was somehow redundant. Now, if `pipe' is set, the protocol will be
pipe, otherwise it'll be smtp. That's just natural.
| author | meillo@marmaro.de |
|---|---|
| date | Sun, 24 Apr 2011 19:37:56 +0200 |
| parents | f10a56dc7481 |
| children | 55b7bde95d37 |
line wrap: on
line diff
--- a/admin/config-transition Sun Apr 24 19:14:38 2011 +0200 +++ b/admin/config-transition Sun Apr 24 19:37:56 2011 +0200 @@ -1,12 +1,11 @@ #!/bin/sh # # check masqmail config files for options that are obsolete -# -v enables verbose output # # 2010 markus schnalke <meillo@marmaro.de> if [ $# -eq 0 ] ; then - echo "usage: config-transition [-v] CONFIGFILE..." >&2 + echo "usage: config-transition CONFIGFILE..." >&2 exit 1 fi @@ -93,6 +92,10 @@ All we have is a comment in the code saying: This option is used by sqilconf. \ " +check["protocol"] = "route" SUBSEP "Removed in 0.3.2" SUBSEP "\ +If pipe is given, pipe will be used, otherwise smtp will be used. \ +" + # get files # already covered by the get.* and online_gets.* options in the conf @@ -126,26 +129,17 @@ split(check[key], a, SUBSEP); # array index starts with 1 printf("%s:%d: [%s] %s%s\n", FILENAME, NR, a[1], key, checkcomment()); cmd = "fold -sw 70 | sed 's,^,\t,'" - if (verbose) { - print "\t>>>> " \$0 " <<<<" - print a[3] | cmd - close(cmd) - print "\t" a[2] - print "" - } + print "\t>>>> " \$0 " <<<<" + print a[3] | cmd + close(cmd) + print "\t" a[2] + print "" } } ! -verbose=0 -if [ X"$1" = X"-v" ] ; then - verbose=1 - shift -fi - for i do - awk -f "$awkscript" "verbose=$verbose" "$i" + awk -f "$awkscript" "$i" done -