Fix annoying situation with 2+ started instances waiting for password

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>

1 files changed, 44 insertions, 26 deletions

diff --git a/watch-bz b/watch-bz
index 11e7d84..1aaf429 100755
--- a/watch-bz
+++ b/watch-bz
@@ -87,36 +87,54 @@ do_logout () {
 	rm "${BUGZILLA_COOKIE}" && echo "watch-bz: Authorization cookie removed"
 }
 
-# exclusively using globals
-do_init () {
-	# login when available
-	if [ -n "$BZUSER" ] && [ ! -f "${BUGZILLA_COOKIE}" ]; then
-		[ -n "$BZPASSWORD" ] \
-		  || read -s -t 60 -p 'Password (1 min timeout): ' BZPASSWORD \
-		  || exit $?
-		if which expect &>/dev/null; then
-			expect - <<-EOF
-			log_user 0
-			spawn $BUGZILLA --cookiefile=${BUGZILLA_COOKIE} login $BZUSER
-			expect "Password: "
-			send "${BZPASSWORD}\r"
-			send_user "wait a bit..."
-			expect eof
-			EOF
-		else
-			echo "Passing password through command-line argument is DANGEROUS"
-			local yn; read -p 'Continue? [yN]' yn
-			[ "${yn}" -ne "y" ] && exit
-			spawn $BUGZILLA --cookiefile=${BUGZILLA_COOKIE} login $BZUSER $BZPASSWORD
-		fi
-		if [ $? -ne 0 ]; then
-			echo "Cannot log in"
-			exit 2
-		fi
+do_init_login () {
+	if [ -z "$BZPASSWORD" ]; then
+		trap return USR1
+		{
+		timeout 60 /bin/sh -c \
+			"while [ ! -f \"${BUGZILLA_COOKIE}\" ]; do \
+				sleep 1; \
+			done" \
+		  && echo "wow, cookie emerged"
+		kill -USR1 -$$
+		} & read -s -p 'Password (1 min timeout): ' BZPASSWORD \
+		  || return $?
+		trap '' USR1
+	fi
+
+	rm -f -- ${BUGZILLA_COOKIE}.init
+	if which expect &>/dev/null; then
+		expect - <<-EOF
+		log_user 0
+		spawn $BUGZILLA --cookiefile=${BUGZILLA_COOKIE}.init login $BZUSER
+		expect "Password: "
+		send "${BZPASSWORD}\r"
+		send_user "wait a bit..."
+		expect eof
+		EOF
+	else
+		echo "Passing password through command-line argument is DANGEROUS"
+		local yn; read -p 'Continue? [yN]' yn
+		[ "${yn}" -ne "y" ] && exit
+		spawn $BUGZILLA --cookiefile=${BUGZILLA_COOKIE}.init login $BZUSER $BZPASSWORD
+	fi
+	if [ $? -ne 0 ]; then
+		echo "Cannot log in"
+		return 2
 	fi
+	cp -n -- ${BUGZILLA_COOKIE}{.init,}
+	rm -f -- ${BUGZILLA_COOKIE}.init
+}
 
+# exclusively using globals
+do_init () {
 	# C-c handler to optionally remove cookie on exit
 	test $BUGZILLA_LOGOUT -ne 0 && trap do_logout INT
+
+	# login when appropriate
+	if [ -n "$BZUSER" ] && [ ! -f "${BUGZILLA_COOKIE}" ]; then
+		do_init_login || exit $?
+	fi
 }
 
 # exclusively using globals