eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-24 03:59:46 +01:00
Code Issues Releases Wiki Activity

home-manager: show full script path on activation error

Browse source 
Run the activation script in its original nix-store location so that
Bash error messages show the real script location instead of 'wrkdir',
which gets deleted right after the script exits.

(cherry picked from commit 02a501705a)
This commit is contained in:
Cornelius Mika 2017-08-17 10:16:26 +02:00 committed by Robert Helgesson
parent 463d6db90b
commit 758d2ef9c1
No known key found for this signature in database
GPG key ID: C3DB11069E65DC86
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
home-manager/home-manager
View file

@ -91,8 +91,9 @@ function doSwitch() {
local wrkdir local wrkdir
wrkdir="$(mktemp -d)" wrkdir="$(mktemp -d)"
local generation
local exitCode=0 local exitCode=0
doBuild "$wrkdir/generation" && "$wrkdir/generation/activate" || exitCode=1 generation=$(doBuild "$wrkdir/result") && $generation/activate || exitCode=1
# Because the previous command never fails, the script keeps running and # Because the previous command never fails, the script keeps running and
# $wrkdir is always removed. # $wrkdir is always removed.