From: Tormod Volden <[email protected]>
- Do not specify -e twice.
- Use "which" instead of calling commands that might not exist.
- Fix bashism ("==" is C not sh)
- Carefully quote potentially empty variables
- Check command arguments before doing anything
- Rewrite argument checking to be more easily extensible
- Consistent indentation
- UNIX style error messages
---
> How about this?
Or this :)
Cheers,
Tormod
bootstrap | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/bootstrap b/bootstrap
index 39ece23..b64a6e0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,18 +1,26 @@
-#!/bin/sh -e
+#!/bin/sh
# Run the autotools bootstrap sequence to create the configure script
-# Stop execution as soon as we have an unknown command
+# Abort execution on error
set -e
-if libtoolize --version >/dev/null 2>&1; then
+if which libtoolize > /dev/null; then
libtoolize="libtoolize"
-elif glibtoolize --version >/dev/null 2>&1; then
+elif which glibtoolize >/dev/null; then
libtoolize="glibtoolize"
else
- echo "libtool is required" >&2
+ echo "$0: Error: libtool is required" >&2
exit 1
fi
+if [ "$1" = "nosubmodule" ]; then
+ SKIP_SUBMODULE=1
+elif [ -n "$1" ]; then
+ echo "Illegal argument $1"
+ echo "USAGE: $0 [nosubmodule]"
+ exit 1
+fi
+
# bootstrap the autotools
(
set -x
@@ -27,16 +35,13 @@ automake --gnu --add-missing --copy
# current source snapshots (working from GIT, or some source snapshot, etc)
# otherwise the documentation will fail to build due to missing version.texi
-if [ $1 == nosubmodule ]; then
- echo "Skipping submodule setup"
-elif [ -z $1 ]; then
+if [ -z "$SKIP_SUBMODULE" ]; then
echo "Setting up submodules"
git submodule init
git submodule update
else
- echo "Argument to bootstrap is either no argument or nosubmodule"
- exit 1
+ echo "Skipping submodule setup"
fi
-echo "Bootstrap complete. Quick start build instructions:"
+echo "Bootstrap complete. Quick build instructions:"
echo "./configure --enable-maintainer-mode ...."
--
1.7.0.4
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development
