]> code.delx.au - dotfiles/blobdiff - .bash/environment
tern-config
[dotfiles] / .bash / environment
index e14b4e9721a872e3f9d32dd62ce2dac037257d51..8ccb665fe8e95f00fd7d5565f696e39ab7f286d2 100644 (file)
@@ -31,18 +31,15 @@ else
     export EDITORBG="vim"
 fi
 
-# Expand any symbolic links in the TMPDIR environment variable
-[ -n "$TMPDIR" ] && export TMPDIR="$(cd "${TMPDIR}" && pwd -P)"
-
-# Load the bash functions
 source "${HOME}/.bash/functions"
 
-# The current directory shouldn't be in the path
-pathremove .
+pathprepend "${HOME}/bin"
+
+# Pick up SSH agent socket in case it isn't set automatically
+if [ -z "$SSH_AUTH_SOCK" ]; then
+    export SSH_AUTH_SOCK="/run/user/$(id -u)/keyring/ssh"
+fi
 
 # Load local environment settings
 [ -r "${HOME}/.bash/environment_local" ] && source "${HOME}/.bash/environment_local"
 
-# ~/bin should be in the front of path if it exists
-pathprepend "${HOME}/bin"
-