1.1 --- a/admin/config-transition	Sun Apr 24 19:14:38 2011 +0200
     1.2 +++ b/admin/config-transition	Sun Apr 24 19:37:56 2011 +0200
     1.3 @@ -1,12 +1,11 @@
     1.4  #!/bin/sh
     1.5  #
     1.6  # check masqmail config files for options that are obsolete
     1.7 -# -v enables verbose output
     1.8  #
     1.9  # 2010  markus schnalke <meillo@marmaro.de>
    1.10  
    1.11  if [ $# -eq 0 ] ; then
    1.12 -	echo "usage: config-transition [-v] CONFIGFILE..." >&2
    1.13 +	echo "usage: config-transition CONFIGFILE..." >&2
    1.14  	exit 1
    1.15  fi
    1.16  
    1.17 @@ -93,6 +92,10 @@
    1.18  All we have is a comment in the code saying: This option is used by sqilconf. \
    1.19  "
    1.20  
    1.21 +check["protocol"] = "route" SUBSEP "Removed in 0.3.2" SUBSEP "\
    1.22 +If pipe is given, pipe will be used, otherwise smtp will be used. \
    1.23 +"
    1.24 +
    1.25  # get files
    1.26  
    1.27  # already covered by the get.* and online_gets.* options in the conf
    1.28 @@ -126,26 +129,17 @@
    1.29  		split(check[key], a, SUBSEP);  # array index starts with 1
    1.30  		printf("%s:%d: [%s] %s%s\n", FILENAME, NR, a[1], key, checkcomment());
    1.31  		cmd = "fold -sw 70 | sed 's,^,\t,'"
    1.32 -		if (verbose) {
    1.33 -			print "\t>>>> " \$0 " <<<<"
    1.34 -			print a[3] | cmd
    1.35 -			close(cmd)
    1.36 -			print "\t" a[2]
    1.37 -			print ""
    1.38 -		}
    1.39 +		print "\t>>>> " \$0 " <<<<"
    1.40 +		print a[3] | cmd
    1.41 +		close(cmd)
    1.42 +		print "\t" a[2]
    1.43 +		print ""
    1.44  	}
    1.45  }
    1.46  			
    1.47  !
    1.48  
    1.49  
    1.50 -verbose=0
    1.51 -if [ X"$1" = X"-v" ] ; then
    1.52 -	verbose=1
    1.53 -	shift
    1.54 -fi
    1.55 -
    1.56  for i do
    1.57 -	awk -f "$awkscript" "verbose=$verbose" "$i"
    1.58 +	awk -f "$awkscript" "$i"
    1.59  done
    1.60 -