Don't count on 'trap 0' inside () in shell script

(this is the same change as commit 2626e112ed2a75058c6a5e98cce21f1af08a8ace, but as applied)

1 files changed, 11 insertions, 14 deletions

diff --git a/perl_exp.SH b/perl_exp.SH
index d964bdf60d..c0702d08da 100755
--- a/perl_exp.SH
+++ b/perl_exp.SH
@@ -40,20 +40,17 @@ echo "#!" > perl.exp
 
 case "$bincompat3" in
 y*)
-	(
-	  global=/tmp/exp$$g
-	  interp=/tmp/exp$$i
-	  compat3=/tmp/exp$$c
-	  trap 'rm -f $global $interp $compat3' 0
-	  trap 'exit 1' 1 2 3 13 15
-	  grep '^[A-Za-z]' global.sym | sort >$global
-	  grep '^[A-Za-z]' interp.sym | sort >$interp
-	  grep '^[A-Za-z]' compat3.sym | sort >$compat3
-	  comm -23 $global $compat3 | sed 's/^/Perl_/' >> perl.exp
-	  comm -12 $interp $compat3 | sed 's/^/Perl_/' >> perl.exp
-	  comm -12 $global $compat3 >> perl.exp
-	  comm -23 $interp $compat3 >> perl.exp
-	)
+	global=/tmp/exp$$g
+	interp=/tmp/exp$$i
+	compat3=/tmp/exp$$c
+	grep '^[A-Za-z]' global.sym | sort >$global
+	grep '^[A-Za-z]' interp.sym | sort >$interp
+	grep '^[A-Za-z]' compat3.sym | sort >$compat3
+	comm -23 $global $compat3 | sed 's/^/Perl_/' >> perl.exp
+	comm -12 $interp $compat3 | sed 's/^/Perl_/' >> perl.exp
+	comm -12 $global $compat3 >> perl.exp
+	comm -23 $interp $compat3 >> perl.exp
+	rm -f $global $interp $compat3
 	;;
 *)
 	sed -n '/^[A-Za-z]/ s/^/Perl_/p' global.sym interp.sym >> perl.exp