shell/env: prefer ~/bin over ~/.bin

[config/dotfiles.git] / shell / env

diff --git a/shell/env b/shell/env
index 2327cfef0a89df086ca1ae2f62890ff6c7825125..bd529ba1ce2f5ef25542d3d7a48f9e9394062add 100644 (file)
--- a/shell/env
+++ b/shell/env
@@ -1,6 +1,6 @@
 # Configuration file for environment related options for all shells.
 
-# Copyright (C) 2011-2014  Simon Ruderich
+# Copyright (C) 2011-2015  Simon Ruderich
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -39,21 +39,20 @@ unset LC_NUMERIC
 unset LC_PAPER
 unset LC_TELEPHONE
 unset LC_TIME
-
 # Make sure $LANGUAGE is not set. It's a GNU extension which can overwrite
 # variables like $LANG or $LC_ALL.
 unset LANGUAGE
 
-# Add ~/bin and ~/.bin and ~/.shell/bin to PATH if available.
+# Add ~/bin, ~/.bin and ~/.shell/bin to PATH if available.
 if test -d "$HOME/.shell/bin"; then
     PATH="$HOME/.shell/bin:$PATH"
 fi
-if test -d "$HOME/bin"; then
-    PATH="$HOME/bin:$PATH"
-fi
 if test -d "$HOME/.bin"; then
     PATH="$HOME/.bin:$PATH"
 fi
+if test -d "$HOME/bin"; then
+    PATH="$HOME/bin:$PATH"
+fi
 
 # Use Vim as editor.
 EDITOR=vim
@@ -83,16 +82,16 @@ export LESS_TERMCAP_so LESS_TERMCAP_se
 
 # Use ~/.tmp as directory for temporary files if available to reduce security
 # problems on multi-user systems.
-if test -O "$HOME/.tmp" && test -d "$HOME/.tmp"; then
-    TMP=$HOME/.tmp
-    TEMP=$TMP
-    TMPDIR=$TMP
+if test -d "$HOME/.tmp"; then
+    TMP="$HOME/.tmp"
+    TEMP="$TMP"
+    TMPDIR="$TMP"
     export TMP TEMP TMPDIR
 # Also try ~/tmp as fallback.
-elif test -O "$HOME/tmp" && test -d "$HOME/tmp"; then
-    TMP=$HOME/tmp
-    TEMP=$TMP
-    TMPDIR=$TMP
+elif test -d "$HOME/tmp"; then
+    TMP="$HOME/tmp"
+    TEMP="$TMP"
+    TMPDIR="$TMP"
     export TMP TEMP TMPDIR
 fi