From cd4db096e5d1cb89ed328d3247efec7db1145e54 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 25 Sep 2015 13:07:21 +0200
Subject: Remove else-branch from if-else by negating condition

---
 nix-script-switch.sh | 51 ++++++++++++++++++++++++---------------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

(limited to 'nix-script-switch.sh')

diff --git a/nix-script-switch.sh b/nix-script-switch.sh
index 910d30f..fddb453 100755
--- a/nix-script-switch.sh
+++ b/nix-script-switch.sh
@@ -181,41 +181,38 @@ else
     REBUILD_EXIT=0
 fi
 
-if [[ $REBUILD_EXIT -eq 0 ]]
-then
-    LASTGEN=$(current_system_generation)
-    sudo -k
+[[ ! $REBUILD_EXIT -eq 0 ]] && \
+    stderr "Switching failed. Won't executing any further commands." && \
+    exit $REBUILD_EXIT
 
-    stdout "sudo -k succeeded"
-    stdout "Last generation was: $LASTGEN"
+LASTGEN=$(current_system_generation)
+sudo -k
 
-    if [[ -z "$TAG_NAME" ]]
-    then
-        if [[ -z "$HOSTNAME" ]]; then TAG_NAME="nixos-$LASTGEN-$COMMAND"
-        else TAG_NAME="nixos-$HOSTNAME-$LASTGEN-$COMMAND"
-        fi
+stdout "sudo -k succeeded"
+stdout "Last generation was: $LASTGEN"
+
+if [[ -z "$TAG_NAME" ]]
+then
+    if [[ -z "$HOSTNAME" ]]; then TAG_NAME="nixos-$LASTGEN-$COMMAND"
+    else TAG_NAME="nixos-$HOSTNAME-$LASTGEN-$COMMAND"
     fi
+fi
 
-    __git "$WD" tag $TAG_FLAGS "$TAG_NAME"
+__git "$WD" tag $TAG_FLAGS "$TAG_NAME"
 
-    if [[ $TAG_NIXPKGS -eq 1 ]]
+if [[ $TAG_NIXPKGS -eq 1 ]]
+then
+    if [[ ! -z "$NIXPKGS" ]]
     then
-        if [[ ! -z "$NIXPKGS" ]]
-        then
-            stdout "Trying to generate tag in $NIXPKGS"
-            tag_nixpkgs "$NIXPKGS"
-        else
-            stderr "Do not generate a tag in the nixpkgs clon"
-            stderr "no NIXPKGS given."
-            usage
-            stderr "Continuing..."
-        fi
+        stdout "Trying to generate tag in $NIXPKGS"
+        tag_nixpkgs "$NIXPKGS"
     else
-        stdout "nixpkgs tag generating disabled"
+        stderr "Do not generate a tag in the nixpkgs clon"
+        stderr "no NIXPKGS given."
+        usage
+        stderr "Continuing..."
     fi
-
 else
-    stderr "Switching failed. Won't executing any further commands."
-    exit $REBUILD_EXIT
+    stdout "nixpkgs tag generating disabled"
 fi
 
-- 
cgit v1.2.3