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 f4271cf7001f304732ba95f3852045b48911ff88..86f1d918a368b9c16a6a4850527c539a359e12a4 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 02176d280a61ec7877bfe610a8e39ff4aadf4842..031ecf75540599ef353c7a1cad3e69725f2166b3 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.