eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-06-27 00:48:32 +02:00
Code Issues Releases Wiki Activity

home-manager: exit with an error on build failure

Browse Source 
Because 'set -e' has no effect on commands that run in an if condition,
the script was always exiting with no error when 'doBuild' failed.

As a bonus, $wrkdir is now always removed after building.
This commit is contained in:
Cornelius Mika 2017-08-17 10:16:25 +02:00 committed by Robert Helgesson
parent ffbc7e723d
commit a9d9fb5d75
No known key found for this signature in database
GPG Key ID: C3DB11069E65DC86
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
home-manager/home-manager
View File

@ -91,11 +91,13 @@ function doSwitch() {
local wrkdir local wrkdir
wrkdir="$(mktemp -d)" wrkdir="$(mktemp -d)"
if doBuild "$wrkdir/generation" ; then local exitCode=0
"$wrkdir/generation/activate" doBuild "$wrkdir/generation" && "$wrkdir/generation/activate" || exitCode=1
fi
# Because the previous command never fails, the script keeps running and
# $wrkdir is always removed.
rm -r "$wrkdir" rm -r "$wrkdir"
return $exitCode
} }
function doListGens() { function doListGens() {