From 9d6eab06055d26a22384d7aca34214cbcd904584 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sat, 18 Feb 2017 21:32:35 +1300
Subject: Use short-circuits in .profile.d scripts

---
 sh/profile.d/games.sh    | 3 ++-
 sh/profile.d/keychain.sh | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'sh')

diff --git a/sh/profile.d/games.sh b/sh/profile.d/games.sh
index 58db3487..ee56c593 100644
--- a/sh/profile.d/games.sh
+++ b/sh/profile.d/games.sh
@@ -1,2 +1,3 @@
 # Add ~/.local/games to PATH if it exists
-[ -d "$HOME"/.local/games ] && PATH=$HOME/.local/games:$PATH
+[ -d "$HOME"/.local/games ] || return
+PATH=$HOME/.local/games:$PATH
diff --git a/sh/profile.d/keychain.sh b/sh/profile.d/keychain.sh
index 9213de7f..f3d25c62 100644
--- a/sh/profile.d/keychain.sh
+++ b/sh/profile.d/keychain.sh
@@ -1,5 +1,5 @@
 # keychain setup
-command -v keychain >/dev/null 2>&1 &&
-    eval "$(TERM=${TERM:-ansi} keychain \
-        --eval --ignore-missing --quick --quiet \
-        id_dsa id_rsa id_ecsda)"
+command -v keychain >/dev/null 2>&1 || return
+eval "$(TERM=${TERM:-ansi} keychain \
+    --eval --ignore-missing --quick --quiet \
+    id_dsa id_rsa id_ecsda)"
-- 
cgit v1.2.3