bootstrap: exit trap not called when sourcing

2016-08-09 12:17:39 -07:00 · 2016-08-09 12:17:39 -07:00 · 181feef253
commit 181feef253
parent 8e84b6d853
1 changed files with 5 additions and 9 deletions
--- a/bootstrap.sh
+++ b/bootstrap.sh
@ -11,15 +11,6 @@ todo
 - shrink icu data
 '

-# allow sourcing of script without
-# causing the terminal to bail on error
-function finish {
-  set +eu
-  set +o pipefail
-}
-
-trap finish EXIT
-
 MASON_VERSION="7ed8931"

 function setup_mason() {
@ -155,3 +146,8 @@ function main() {
 }

 main
+
+# allow sourcing of script without
+# causing the terminal to bail on error
+set +eu
+set +o pipefail