aboutsummaryrefslogtreecommitdiff
path: root/sh
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2013-07-31 17:37:51 +1200
committerTom Ryder <tom@sanctum.geek.nz>2013-07-31 17:37:51 +1200
commit28930df7da1ba2c79c604f1e4954d19dc05c178e (patch)
tree1ed90e8d160aa17915f41b7d5f182debd44bfacd /sh
parentStop ignoring error output from setup commands (diff)
downloaddotfiles-28930df7da1ba2c79c604f1e4954d19dc05c178e.tar.gz
dotfiles-28930df7da1ba2c79c604f1e4954d19dc05c178e.zip
Keep export calls separate from definitions
Diffstat (limited to 'sh')
-rw-r--r--sh/profile8
-rw-r--r--sh/profile.d/keychain.sh3
2 files changed, 7 insertions, 4 deletions
diff --git a/sh/profile b/sh/profile
index 0a1e12a3..447a9645 100644
--- a/sh/profile
+++ b/sh/profile
@@ -1,9 +1,11 @@
# Set editor
-export EDITOR='vi'
-export VISUAL="$EDITOR"
+EDITOR='vi'
+VISUAL="$EDITOR"
+export EDITOR VISUAL
# Set pager
-export PAGER='less'
+PAGER='less'
+export PAGER
# Add ~/.local/bin to PATH
if [ -d "$HOME/.local/bin" ]; then
diff --git a/sh/profile.d/keychain.sh b/sh/profile.d/keychain.sh
index 3b7b5456..43d81781 100644
--- a/sh/profile.d/keychain.sh
+++ b/sh/profile.d/keychain.sh
@@ -1,6 +1,7 @@
# Keychain
if command -v ssh-askpass >/dev/null; then
- export SSH_ASKPASS=`which ssh-askpass`
+ SSH_ASKPASS=`which ssh-askpass`
+ export SSH_ASKPASS
fi
if command -v keychain >/dev/null; then
eval `keychain --eval --ignore-missing --quiet id_dsa id_rsa id_ecsda`