lib.sh: generate() displays options again.

This was removed in 2b996dfbed52a0ec1592b4820990f97b5147b2d4.

diff --git a/lib.sh b/lib.sh
index fbef907d330bd62aec6bf67a5d0b4c237c267159..189b07e1730ec0625d68714a901dfdb8d5e9810c 100644 (file)
--- a/lib.sh
+++ b/lib.sh
@@ -71,7 +71,7 @@ link() {
 
 # Write a warning to $1 to make clear it should not be modified. $2 is the
 # source for the generated file. Also print a message to stdout that the file
 
 # Write a warning to $1 to make clear it should not be modified. $2 is the
 # source for the generated file. Also print a message to stdout that the file

-# $1 was generated from $2 using the command $3.
+# $1 was generated from $2 using the command $3 with options $4.

 warning() {
     echo "###################################" > $1
     echo "# WARNING! DO NOT EDIT THIS FILE! #" >> $1
 warning() {
     echo "###################################" > $1
     echo "# WARNING! DO NOT EDIT THIS FILE! #" >> $1


@@ -80,8 +80,16 @@ warning() {
     echo "# It was generated from $2 on `date`." >> $1
     echo >> $1
 
     echo "# It was generated from $2 on `date`." >> $1
     echo >> $1
 

+    # Display given options if there were any (zsh has a problem with $options
+    # as variable name).
+    option=
+    if [ -n "$4" ]; then
+        option=" with options '$4'"
+    fi

     # Write message to stdout.
     # Write message to stdout.

-    echo "$3: generating '$1' from '$2'"
+    echo "$3: generating '$1' from '$2'$option"
+
+    unset option

 }
 
 # Generate a file using several methods. A warning is automatically added to
 }
 
 # Generate a file using several methods. A warning is automatically added to


@@ -117,7 +125,7 @@ generate() {
     fi
 
     # Add warning to file and write a message to stdout.
     fi
 
     # Add warning to file and write a message to stdout.

-    warning "$file" "$file$extension" $command
+    warning "$file" "$file$extension" $command "$*"

     # Generate $file from $file$extension using the given command.
     cat "$file$extension" | $command "$@" >> "$file"
 
     # Generate $file from $file$extension using the given command.
     cat "$file$extension" | $command "$@" >> "$file"
 

diff --git a/tests/lib.sh.test.out b/tests/lib.sh.test.out
index ed7a77bfa1b5496c3a3320435ae4e86ae782a042..725a69a56c872cd1d2b71d3da65362dd9499ed00 100644 (file)
--- a/tests/lib.sh.test.out
+++ b/tests/lib.sh.test.out
@@ -2,7 +2,7 @@ ls installed
 Mac OS X which for ls
 ls installed
 Mac OS X which for doesnt-exist
 Mac OS X which for ls
 ls installed
 Mac OS X which for doesnt-exist

-m4: generating 'tmp/test' from 'tmp/test.m4'
+m4: generating 'tmp/test' from 'tmp/test.m4' with options '-DTEST=m4'

 ###################################
 # WARNING! DO NOT EDIT THIS FILE! #
 ###################################
 ###################################
 # WARNING! DO NOT EDIT THIS FILE! #
 ###################################


@@ -10,7 +10,7 @@ m4: generating 'tmp/test' from 'tmp/test.m4'
 
 Simple test file for generate() using m4.
     m4
 
 Simple test file for generate() using m4.
     m4

-m4: generating 'tmp/test-multiple' from 'tmp/test-multiple.m4'
+m4: generating 'tmp/test-multiple' from 'tmp/test-multiple.m4' with options '-DFIRST=first -DSECOND=second'

 ###################################
 # WARNING! DO NOT EDIT THIS FILE! #
 ###################################
 ###################################
 # WARNING! DO NOT EDIT THIS FILE! #
 ###################################


@@ -20,7 +20,7 @@ Test with multiple arguments passed to generate().
 first: first
 second: second
 
 first: first
 second: second
 

-m4: generating 'tmp/test-multiple-spaces' from 'tmp/test-multiple-spaces.m4'
+m4: generating 'tmp/test-multiple-spaces' from 'tmp/test-multiple-spaces.m4' with options '-DFIRST=first with spaces -DSECOND=second with spaces'

 ###################################
 # WARNING! DO NOT EDIT THIS FILE! #
 ###################################
 ###################################
 # WARNING! DO NOT EDIT THIS FILE! #
 ###################################


@@ -30,7 +30,7 @@ Test with multiple arguments with spaces passed to generate().
 first: first with spaces
 second: second with spaces
 
 first: first with spaces
 second: second with spaces
 

-awk: generating 'tmp/test-awk' from 'tmp/test-awk.in'
+awk: generating 'tmp/test-awk' from 'tmp/test-awk.in' with options '{ print $1 }'

 ###################################
 # WARNING! DO NOT EDIT THIS FILE! #
 ###################################
 ###################################
 # WARNING! DO NOT EDIT THIS FILE! #
 ###################################