From f4b59008c1616f860f35146237d29f476c56baa8 Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Wed, 9 May 2012 21:26:21 -0400
Subject: [PATCH] Improve bootstrap error messages.

Kill off the silly trap handler while we're at it, because it never
actually worked properly.  Just don't call die from a subshell.
---
 bootstrap | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/bootstrap b/bootstrap
index 170b5c3..fdfd705 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,15 +1,22 @@
 #!/bin/sh
 
-trap 'exit 1' USR1
-die() { printf '%s\n' "$@" 1>&2; kill -USR1 $$; }
+scriptname=$0
+
+err() {
+	printf '%s: %s\n' "$scriptname" "$@" 1>&2
+}
+
+die() {
+	err "$@"
+	exit 1
+}
 
 : ${AUTORECONF=autoreconf}
 : ${GNULIB=gnulib}
 : ${GIT=git}
 : ${PERL=perl}
 
-$GIT submodule update --init \
-	|| echo "Failed to update submodules from git."
+$GIT submodule update --init || err "Failed to update submodules from git."
 
 if test -x $GNULIB/gnulib-tool; then
 	$GNULIB/gnulib-tool --update -S || die "Failed to update Gnulib."
-- 
2.43.2