From 683f156e170562a6bb6e5aec67d42919f64f9052 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Mon, 31 Dec 2012 02:10:55 +0100 Subject: [PATCH] shell/env: Use test instead of [ and $HOME instead of ~. test and $HOME are more compatible. Not all shells support [ and expand ~. --- shell/env | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/shell/env b/shell/env index 2047e60..45b98bc 100644 --- a/shell/env +++ b/shell/env @@ -25,14 +25,14 @@ LANG=en_US.UTF-8 export LANG # Add ~/bin and ~/.bin and ~/.shell/bin to PATH if available. -if [ -d ~/.shell/bin ]; then - PATH=~/.shell/bin:$PATH +if test -d "$HOME/.shell/bin"; then + PATH="$HOME/.shell/bin:$PATH" fi -if [ -d ~/bin ]; then - PATH=~/bin:$PATH +if test -d "$HOME/bin"; then + PATH="$HOME/bin:$PATH" fi -if [ -d ~/.bin ]; then - PATH=~/.bin:$PATH +if test -d "$HOME/.bin"; then + PATH="$HOME/.bin:$PATH" fi # Use Vim as editor. @@ -45,21 +45,21 @@ export PAGER # Use ~/.tmp as directory for temporary files if available to reduce security # problems on multi-user systems. -if [ -O ~/.tmp -a -d ~/.tmp ]; then - TMP=~/.tmp +if test -O "$HOME/.tmp" && test -d "$HOME/.tmp"; then + TMP=$HOME/.tmp TEMP=$TMP TMPDIR=$TMP export TMP TEMP TMPDIR # Also try ~/tmp as fallback. -elif [ -O ~/tmp -a -d ~/tmp ]; then - TMP=~/tmp +elif test -O "$HOME/tmp" && test -d "$HOME/tmp"; then + TMP=$HOME/tmp TEMP=$TMP TMPDIR=$TMP export TMP TEMP TMPDIR fi # Change rlwrap's home directory to prevent cluttering ~. -RLWRAP_HOME=~/.shell/rlwrap +RLWRAP_HOME="$HOME/.shell/rlwrap" export RLWRAP_HOME # Set colors for GNU ls (and zsh completions). -- 2.44.1