diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-15 11:24:11 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-15 11:24:11 +0200 |
commit | 41e1900ea1a6323918596a17434b2011b5915b40 (patch) | |
tree | f946475ec58a027b34e7ccf7b4bfcecfe96928d5 | |
parent | 49821433242c4f44cff038a039ead3bc9741fbf1 (diff) | |
download | nixlib-41e1900ea1a6323918596a17434b2011b5915b40.tar nixlib-41e1900ea1a6323918596a17434b2011b5915b40.tar.gz nixlib-41e1900ea1a6323918596a17434b2011b5915b40.tar.bz2 nixlib-41e1900ea1a6323918596a17434b2011b5915b40.tar.lz nixlib-41e1900ea1a6323918596a17434b2011b5915b40.tar.xz nixlib-41e1900ea1a6323918596a17434b2011b5915b40.tar.zst nixlib-41e1900ea1a6323918596a17434b2011b5915b40.zip |
Define closeNest before exitHandler
This prevents "closeNest: command not found" messages if setup fails early.
-rw-r--r-- | pkgs/stdenv/generic/setup.sh | 55 |
1 files changed, 29 insertions, 26 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 47e330562708..fb79d8832886 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -73,6 +73,35 @@ _eval() { ###################################################################### +# Logging. + +nestingLevel=0 + +startNest() { + nestingLevel=$(($nestingLevel + 1)) + echo -en "\033[$1p" +} + +stopNest() { + nestingLevel=$(($nestingLevel - 1)) + echo -en "\033[q" +} + +header() { + startNest "$2" + echo "$1" +} + +# Make sure that even when we exit abnormally, the original nesting +# level is properly restored. +closeNest() { + while [ $nestingLevel -gt 0 ]; do + stopNest + done +} + + +###################################################################### # Error handling. exitHandler() { @@ -409,32 +438,6 @@ substituteAllInPlace() { # What follows is the generic builder. -nestingLevel=0 - -startNest() { - nestingLevel=$(($nestingLevel + 1)) - echo -en "\033[$1p" -} - -stopNest() { - nestingLevel=$(($nestingLevel - 1)) - echo -en "\033[q" -} - -header() { - startNest "$2" - echo "$1" -} - -# Make sure that even when we exit abnormally, the original nesting -# level is properly restored. -closeNest() { - while [ $nestingLevel -gt 0 ]; do - stopNest - done -} - - # This function is useful for debugging broken Nix builds. It dumps # all environment variables to a file `env-vars' in the build # directory. If the build fails and the `-K' option is used, you can |