bootstrap: --help to stdout.

	* bootstrap (usage): Don't send --help to stderr.
	Use a here doc instead of a long string.

diff --git a/ChangeLog b/ChangeLog
index ff9105d53cc46bee433943d04f42f0ed53f31f8d..0eae269faec3525d9a97774a435979066937d88b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-31  Akim Demaille  <demaille@gostai.com>
+
+       bootstrap: --help to stdout.
+       * bootstrap (usage): Don't send --help to stderr.
+       Use a here doc instead of a long string.
+

 2009-03-31  Akim Demaille  <demaille@gostai.com>
 
        bootstrap: README-hacking no longer exists
 2009-03-31  Akim Demaille  <demaille@gostai.com>
 
        bootstrap: README-hacking no longer exists

diff --git a/bootstrap b/bootstrap
index 72090116b37877fa8372e9a2ee685e0586ccad7f..4b0abfa64a37221d0cf5a1d3f15703f56b0dffb3 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -36,7 +36,7 @@ bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
 bt2=${bt}2
 
 usage() {
 bt2=${bt}2
 
 usage() {

-  echo >&2 "\
+  cat <<EOF

 Usage: $0 [OPTION]...
 Bootstrap this package from the checked-out sources.
 
 Usage: $0 [OPTION]...
 Bootstrap this package from the checked-out sources.
 


@@ -57,7 +57,7 @@ If the file bootstrap.conf exists in the current working directory, its
 contents are read as shell variables to configure the bootstrap.
 
 Running without arguments will suffice in most cases.
 contents are read as shell variables to configure the bootstrap.
 
 Running without arguments will suffice in most cases.

-"
+EOF

 }
 
 # Configuration.
 }
 
 # Configuration.