This is an automated email from Gerrit.
"R. Diez <rdiez-2...@rd10.de>" just uploaded a new patch set to Gerrit, which
you can find at https://review.openocd.org/c/openocd/+/8532
-- gerrit
commit e26e4364c0f32ccad9e7450b485964f3199fc76c
Author: R. Diez <rdiezmail-open...@yahoo.de>
Date: Fri Nov 1 09:46:05 2024 +0100
Make bootstrap more robust
Change-Id: I67cc22752b34dd49c277e247f0b648047927a02b
Signed-off-by: R. Diez <rdiezmail-open...@yahoo.de>
diff --git a/bootstrap b/bootstrap
index 7d4ca37bd8..9dfdc41aca 100755
--- a/bootstrap
+++ b/bootstrap
@@ -3,8 +3,8 @@
# Run the autotools bootstrap sequence to create the configure script
-# Abort execution on error
-set -e
+set -e # Abort execution on error.
+set -u # Abort if you reference an undefined variable.
if which libtoolize > /dev/null; then
libtoolize="libtoolize"
@@ -15,13 +15,21 @@ else
exit 1
fi
-if [ "$1" = "nosubmodule" ]; then
- SKIP_SUBMODULE=1
-elif [ -n "$1" ]; then
- echo "$0: Illegal argument $1"
- echo "USAGE: $0 [nosubmodule]"
- exit 1
-fi
+SKIP_SUBMODULE=0
+
+case "$#" in
+ 0) ;;
+ 1) if [ "$1" = "nosubmodule" ]; then
+ SKIP_SUBMODULE=1
+ else
+ echo "$0: Illegal argument $1" >&2
+ echo "USAGE: $0 [nosubmodule]" >&2
+ exit 1
+ fi;;
+ *) echo "$0: Wrong number of command-line arguments." >&2
+ echo "USAGE: $0 [nosubmodule]" >&2
+ exit 1;;
+esac
# bootstrap the autotools
(
@@ -34,7 +42,7 @@ autoheader --warnings=all
automake --warnings=all --gnu --add-missing --copy
)
-if [ -n "$SKIP_SUBMODULE" ]; then
+if [ "$SKIP_SUBMODULE" -ne 0 ]; then
echo "Skipping submodule setup"
else
echo "Setting up submodules"
--
