From b6e6a800e89795fddf75cf5f115f5cc2ae115f16 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sun, 21 Aug 2016 23:15:24 +1200
Subject: Style tweaks to profile.d subscripts

---
 sh/profile.d/games.sh    | 4 +---
 sh/profile.d/go.sh       | 4 +---
 sh/profile.d/keychain.sh | 5 +----
 sh/profile.d/verse.sh    | 4 +---
 4 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'sh/profile.d')

diff --git a/sh/profile.d/games.sh b/sh/profile.d/games.sh
index b0dd1d35..58db3487 100644
--- a/sh/profile.d/games.sh
+++ b/sh/profile.d/games.sh
@@ -1,4 +1,2 @@
 # Add ~/.local/games to PATH if it exists
-if [ -d "$HOME"/.local/games ] ; then
-    PATH=$HOME/.local/games:$PATH
-fi
+[ -d "$HOME"/.local/games ] && PATH=$HOME/.local/games:$PATH
diff --git a/sh/profile.d/go.sh b/sh/profile.d/go.sh
index 86bf9994..35a4a803 100644
--- a/sh/profile.d/go.sh
+++ b/sh/profile.d/go.sh
@@ -3,6 +3,4 @@ GOPATH=$HOME/.local/gocode
 export GOPATH
 
 # Prepend GOPATH to PATH for the executables if it exists
-if [ -d "$GOPATH"/bin ] ; then
-    PATH=$GOPATH/bin:$PATH
-fi
+[ -d "$GOPATH"/bin ] && PATH=$GOPATH/bin:$PATH
diff --git a/sh/profile.d/keychain.sh b/sh/profile.d/keychain.sh
index e5d46a41..66c23d32 100644
--- a/sh/profile.d/keychain.sh
+++ b/sh/profile.d/keychain.sh
@@ -3,10 +3,7 @@
     export SSH_ASKPASS
 
 # keychain setup
-if command -v keychain >/dev/null 2>&1 ; then
-
-    # Run keychain as quickly and quietly as possible
+command -v keychain >/dev/null 2>&1 &&
     eval "$(TERM=${TERM:-ansi} keychain \
         --eval --ignore-missing --quick --quiet \
         id_dsa id_rsa id_ecsda)"
-fi
diff --git a/sh/profile.d/verse.sh b/sh/profile.d/verse.sh
index 781d68bc..ef68bb93 100644
--- a/sh/profile.d/verse.sh
+++ b/sh/profile.d/verse.sh
@@ -18,9 +18,7 @@ command -v verse >/dev/null 2>&1 || return
 # date); run in a subshell to keep vars out of global namespace
 (
     now=$(date +%Y-%m-%d)
-    if [ -f "$HOME"/.verse ] ; then
-        last=$(cat -- "$HOME"/.verse)
-    fi
+    [ -f "$HOME"/.verse ] && last=$(cat -- "$HOME"/.verse)
     [ "$now" \> "$last" ] || exit
     verse
     printf '\n'
-- 
cgit v1.2.3