From 9536e540b6890b824f9dab10357cb75f446f3ab3 Mon Sep 17 00:00:00 2001
From: "Kyle J. McKay" <mackyle@gmail.com>
Date: Fri, 14 Feb 2014 22:03:22 -0800
Subject: [PATCH] run-*d.sh: really fix --shell support when interrupted

201a5d4a did not go far enough.  The interrupting signal needs to
be ignored in the parent shell in order to successfully implement
the --shell option.
---
 toolbox/run-jobd.sh  | 6 +++++-
 toolbox/run-taskd.sh | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/toolbox/run-jobd.sh b/toolbox/run-jobd.sh
index cfe4988..20bbf33 100755
--- a/toolbox/run-jobd.sh
+++ b/toolbox/run-jobd.sh
@@ -7,7 +7,11 @@ DEFAULTOPTS="-q -P --load-triggers 12,6 -d 300"
 if [ "$1" = "--shell" ]; then
 	shift
 	trap 'exec "$SHELL" -l -i' EXIT
-	/usr/bin/nice -n 18 perl -I@basedir@/jobd @basedir@/jobd/jobd.pl $DEFAULTOPTS "$@"
+	trap '' HUP INT QUIT PIPE TERM TSTP TTIN TTOU
+	(
+		trap - HUP INT QUIT PIPE TERM TSTP TTIN TTOU
+		/usr/bin/nice -n 18 perl -I@basedir@/jobd @basedir@/jobd/jobd.pl $DEFAULTOPTS "$@"
+	)
 	exit
 fi
 exec /usr/bin/nice -n 18 perl -I@basedir@/jobd @basedir@/jobd/jobd.pl $DEFAULTOPTS "$@"
diff --git a/toolbox/run-taskd.sh b/toolbox/run-taskd.sh
index 35a30a3..1acc053 100755
--- a/toolbox/run-taskd.sh
+++ b/toolbox/run-taskd.sh
@@ -5,7 +5,11 @@ cd "$HOME"
 if [ "$1" = "--shell" ]; then
 	shift
 	trap 'exec "$SHELL" -l -i' EXIT
-	perl -I@basedir@/taskd @basedir@/taskd/taskd.pl "$@"
+	trap '' HUP INT QUIT PIPE TERM TSTP TTIN TTOU
+	(
+		trap - HUP INT QUIT PIPE TERM TSTP TTIN TTOU
+		perl -I@basedir@/taskd @basedir@/taskd/taskd.pl "$@"
+	)
 	exit
 fi
 exec perl -I@basedir@/taskd @basedir@/taskd/taskd.pl "$@"
-- 
2.11.4.GIT