aboutsummaryrefslogtreecommitdiff
path: root/sh
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2013-07-31 17:46:34 +1200
committerTom Ryder <tom@sanctum.geek.nz>2013-07-31 17:46:34 +1200
commit8af8a11034816f54dec1332ac43e44320db9cb48 (patch)
treef492eb4eaabbf42d434a2685947d61dbd8f61391 /sh
parentTrailing whitespace fixes (diff)
downloaddotfiles-8af8a11034816f54dec1332ac43e44320db9cb48.tar.gz
dotfiles-8af8a11034816f54dec1332ac43e44320db9cb48.zip
Improve comments on shell scripts
Diffstat (limited to 'sh')
-rw-r--r--sh/profile4
-rw-r--r--sh/profile.d/keychain.sh4
2 files changed, 5 insertions, 3 deletions
diff --git a/sh/profile b/sh/profile
index 447a9645..813fb7cc 100644
--- a/sh/profile
+++ b/sh/profile
@@ -7,13 +7,13 @@ export EDITOR VISUAL
PAGER='less'
export PAGER
-# Add ~/.local/bin to PATH
+# Add ~/.local/bin to PATH if it exists
if [ -d "$HOME/.local/bin" ]; then
PATH="$HOME/.local/bin:$PATH"
fi
export PATH
-# Load any supplementary scripts
+# Load all supplementary scripts in ~/.profile.d
if [ -d "$HOME/.profile.d" ]; then
for file in $HOME/.profile.d/*; do
. $file
diff --git a/sh/profile.d/keychain.sh b/sh/profile.d/keychain.sh
index 01fe8711..6ce780fb 100644
--- a/sh/profile.d/keychain.sh
+++ b/sh/profile.d/keychain.sh
@@ -1,8 +1,10 @@
-# Keychain
+# ssh-askpass setup
if command -v ssh-askpass >/dev/null; then
SSH_ASKPASS=$(which ssh-askpass)
export SSH_ASKPASS
fi
+
+# keychain setup
if command -v keychain >/dev/null; then
eval $(keychain --eval --ignore-missing --quiet id_dsa id_rsa id_ecsda)
fi