diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-10-27 16:32:46 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-10-27 16:32:46 +0000 |
| commit | fd394a7c4a8991df3270ff9f43b73273bde699d4 (patch) | |
| tree | fb84e2a19a753a45af775d05ade3979bbfe9ff5c /pkgs/stdenv/generic/setup.sh | |
| parent | de1c91bc002d555fc5b40f928999a7cc0e15df2a (diff) | |
| download | nixpkgs-fd394a7c4a8991df3270ff9f43b73273bde699d4.tar nixpkgs-fd394a7c4a8991df3270ff9f43b73273bde699d4.tar.gz nixpkgs-fd394a7c4a8991df3270ff9f43b73273bde699d4.tar.bz2 nixpkgs-fd394a7c4a8991df3270ff9f43b73273bde699d4.tar.lz nixpkgs-fd394a7c4a8991df3270ff9f43b73273bde699d4.tar.xz nixpkgs-fd394a7c4a8991df3270ff9f43b73273bde699d4.tar.zst nixpkgs-fd394a7c4a8991df3270ff9f43b73273bde699d4.zip | |
* Only print "@ phase..." messages on demand since they're kind of
ugly and we already print phases (with start and end markers). * Remove some stray tabs. svn path=/nixpkgs/branches/stdenv-updates/; revision=30059
Diffstat (limited to 'pkgs/stdenv/generic/setup.sh')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 66be3875413..bf1642d84aa 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -453,8 +453,8 @@ unpackFile() { case "$curSrc" in *.tar | *.tar.* | *.tgz | *.tbz2) - # GNU tar can automatically select the decompression method - # (info "(tar) gzip"). + # GNU tar can automatically select the decompression method + # (info "(tar) gzip"). tar xvf $curSrc ;; *.zip) @@ -834,9 +834,11 @@ genericBuild() { if test "$curPhase" = installPhase -a -n "$dontInstall"; then continue; fi if test "$curPhase" = fixupPhase -a -n "$dontFixup"; then continue; fi if test "$curPhase" = distPhase -a -z "$doDist"; then continue; fi - - echo - echo "@ phase-started $out $curPhase" + + if [ -n "$tracePhases" ]; then + echo + echo "@ phase-started $out $curPhase" + fi showPhaseHeader "$curPhase" dumpVars @@ -849,8 +851,10 @@ genericBuild() { cd "${sourceRoot:-.}" fi - echo - echo "@ phase-succeeded $out $curPhase" + if [ -n "$tracePhases" ]; then + echo + echo "@ phase-succeeded $out $curPhase" + fi stopNest done |