aboutsummaryrefslogtreecommitdiff
path: root/sh
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2013-07-31 17:26:30 +1200
committerTom Ryder <tom@sanctum.geek.nz>2013-07-31 17:26:30 +1200
commitf5ed4cd090b321064039441e40fe46a6995abf9a (patch)
tree371166922ae8e079eca565322496068d658b00ba /sh
parentPlace missing quotes (diff)
downloaddotfiles-f5ed4cd090b321064039441e40fe46a6995abf9a.tar.gz
dotfiles-f5ed4cd090b321064039441e40fe46a6995abf9a.zip
Use standard structure for if/for in shell
Mostly for clarity reasons; using this syntax: if [ condition ]; then commands fi As opposed to: if [ condition ] then commands fi Or: [ condition ] && command
Diffstat (limited to 'sh')
-rw-r--r--sh/profile10
-rw-r--r--sh/profile.d/browser.sh3
-rw-r--r--sh/profile.d/keychain.sh10
3 files changed, 12 insertions, 11 deletions
diff --git a/sh/profile b/sh/profile
index d5a2fec8..0a1e12a3 100644
--- a/sh/profile
+++ b/sh/profile
@@ -6,14 +6,14 @@ export VISUAL="$EDITOR"
export PAGER='less'
# Add ~/.local/bin to PATH
-[ -d "$HOME/.local/bin" ] && PATH="$HOME/.local/bin:$PATH"
+if [ -d "$HOME/.local/bin" ]; then
+ PATH="$HOME/.local/bin:$PATH"
+fi
export PATH
# Load any supplementary scripts
-if [ -d "$HOME/.profile.d" ]
-then
- for file in $HOME/.profile.d/*
- do
+if [ -d "$HOME/.profile.d" ]; then
+ for file in $HOME/.profile.d/*; do
. $file
done
fi
diff --git a/sh/profile.d/browser.sh b/sh/profile.d/browser.sh
index 2b060b06..094d2095 100644
--- a/sh/profile.d/browser.sh
+++ b/sh/profile.d/browser.sh
@@ -1,6 +1,5 @@
# Browser
-if [ -n "$DISPLAY" ]
-then
+if [ -n "$DISPLAY" ]; then
BROWSER='firefox'
else
BROWSER='lynx'
diff --git a/sh/profile.d/keychain.sh b/sh/profile.d/keychain.sh
index a53edb65..3b7b5456 100644
--- a/sh/profile.d/keychain.sh
+++ b/sh/profile.d/keychain.sh
@@ -1,6 +1,8 @@
# Keychain
-command -v ssh-askpass >/dev/null 2>&1 \
- && export SSH_ASKPASS=`which ssh-askpass`
-command -v keychain >/dev/null 2>&1 \
- && eval `keychain --eval --ignore-missing --quiet id_dsa id_rsa id_ecsda`
+if command -v ssh-askpass >/dev/null; then
+ export SSH_ASKPASS=`which ssh-askpass`
+fi
+if command -v keychain >/dev/null; then
+ eval `keychain --eval --ignore-missing --quiet id_dsa id_rsa id_ecsda`
+fi