From af63a0b3eb0a528e39992e1f10c07d8a78a84e77 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Mon, 4 Oct 2010 23:02:32 +0200 Subject: Parametrize warning message The concat warn parameter can now be any string (and needs to include the appropriate commenting character) and will then override the default (which still gets printed when warn=>true). Signed-off-by: martin f. krafft --- files/concatfragments.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) mode change 100755 => 100644 files/concatfragments.sh (limited to 'files') diff --git a/files/concatfragments.sh b/files/concatfragments.sh old mode 100755 new mode 100644 index 570853e..b486047 --- a/files/concatfragments.sh +++ b/files/concatfragments.sh @@ -47,12 +47,12 @@ SORTARG="-z" PATH=/sbin:/usr/sbin:/bin:/usr/bin -while getopts "o:s:d:tnwf" options; do +while getopts "o:s:d:tnw:f" options; do case $options in o ) OUTFILE=$OPTARG;; d ) WORKDIR=$OPTARG;; n ) SORTARG="-zn";; - w ) WARN="true";; + w ) WARNMSG="$OPTARG";; f ) FORCE="true";; t ) TEST="true";; * ) echo "Specify output file with -o and fragments directory with -d" @@ -101,10 +101,10 @@ fi cd ${WORKDIR} -if [ x${WARN} = "x" ]; then - cat /dev/null > "fragments.concat" +if [ x${WARNMSG} = "x" ]; then + : > "fragments.concat" else - echo '# This file is managed by Puppet. DO NOT EDIT.' > "fragments.concat" + echo -e "$WARNMSG" > "fragments.concat" fi # find all the files in the fragments directory, sort them numerically and concat to fragments.concat in the working dir -- cgit v1.2.3