diff options
| author | Cornelius Mika <cornelius.mika@gmail.com> | 2017-08-17 10:16:26 +0200 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2017-08-20 09:50:42 +0200 |
| commit | 02a501705a11f14ddc21a215c01ed3c1c16a007c (patch) | |
| tree | 5ae6dc94be012c0d6eaa8dd80ebcd9a006ea083e /home-manager/home-manager | |
| parent | a9d9fb5d75b57fd9932aeab957c6b938fb6e41a2 (diff) | |
home-manager: show full script path on activation error
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.
Diffstat (limited to 'home-manager/home-manager')
| -rw-r--r-- | home-manager/home-manager | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/home-manager/home-manager b/home-manager/home-manager index f599d9008d3..45fe0e1cba6 100644 --- a/home-manager/home-manager +++ b/home-manager/home-manager @@ -91,8 +91,9 @@ function doSwitch() { local wrkdir wrkdir="$(mktemp -d)" + local generation 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 # $wrkdir is always removed. |