From 398c0b36a3d8f7285db938468f46e82cf1a3d746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 14 Nov 2021 13:53:14 +0100
Subject: [PATCH] home-manager: properly forward exit codes

---
 home-manager/home-manager | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/home-manager/home-manager b/home-manager/home-manager
index eccb76cf..deabe70c 100644
--- a/home-manager/home-manager
+++ b/home-manager/home-manager
@@ -248,14 +248,12 @@ function doBuild() {
 
     setFlakeAttribute
     if [[ -v FLAKE_CONFIG_URI ]]; then
-        local exitCode=0
         nix build \
             "${PASSTHROUGH_OPTS[@]}" \
              ${DRY_RUN+--dry-run} \
              ${NO_OUT_LINK+--no-link} \
             "$FLAKE_CONFIG_URI.activationPackage" \
-            || exitCode=1
-        return $exitCode
+            || return
     fi
 
     setWorkDir
@@ -263,26 +261,21 @@ function doBuild() {
     local newsInfo
     newsInfo=$(buildNews)
 
-    local exitCode
     doBuildAttr \
                 ${NO_OUT_LINK+--no-out-link} \
                 --attr activationPackage \
-        && exitCode=0 || exitCode=1
+        || return
 
     presentNews "$newsInfo"
-
-    return $exitCode
 }
 
 function doSwitch() {
     setFlakeAttribute
     if [[ -v FLAKE_CONFIG_URI ]]; then
-        local exitCode=0
         nix run \
             "${PASSTHROUGH_OPTS[@]}" \
             "$FLAKE_CONFIG_URI.activationPackage" \
-            || exitCode=1
-        return $exitCode
+            || return
     fi
 
     setWorkDir
@@ -291,7 +284,6 @@ function doSwitch() {
     newsInfo=$(buildNews)
 
     local generation
-    local exitCode=0
 
     # Build the generation and run the activate script. Note, we
     # specify an output link so that it is treated as a GC root. This
@@ -302,11 +294,9 @@ function doSwitch() {
     doBuildAttr \
                 --out-link "$generation" \
                 --attr activationPackage \
-        && "$generation/activate" || exitCode=1
+        && "$generation/activate" || return
 
     presentNews "$newsInfo"
-
-    return $exitCode
 }
 
 function doListGens() {