From 864a356fcd49dd694cf18be8b4dfeb52c5a602d6 Mon Sep 17 00:00:00 2001 From: Iain Patterson Date: Thu, 13 Mar 2008 21:33:18 +0000 Subject: [PATCH] Further cross-platform tidyups. git-svn-id: https://svn.cambridge.iain.cx/profile/trunk@105 6be0d1a5-5cfe-0310-89b6-964be062b18b --- .profile.d/aliases.bashrc | 4 ++-- .profile.d/variables.bashrc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.profile.d/aliases.bashrc b/.profile.d/aliases.bashrc index bb244a7..3b3897b 100644 --- a/.profile.d/aliases.bashrc +++ b/.profile.d/aliases.bashrc @@ -1,9 +1,9 @@ # $Id$ -grep -V | grep GNU &>/dev/null && alias grep='grep --color=auto' +grep -V 2>/dev/null | grep GNU >/dev/null && alias grep='grep --color=auto' alias knh='kill_known_host' alias l='ls' alias ls='/bin/ls $LS_OPTIONS' -if which vim &>/dev/null; then +if which vim 2>/dev/null | grep ^/ >/dev/null; then alias vim='vim +syn\ on' alias vi='vim' fi diff --git a/.profile.d/variables.bashrc b/.profile.d/variables.bashrc index 45f8302..3182c19 100644 --- a/.profile.d/variables.bashrc +++ b/.profile.d/variables.bashrc @@ -6,7 +6,7 @@ export SSHTERM_EXEC=-e export TERM=linux unset LANG export LC_CTYPE=en_GB -if ls --help 2>/dev/null | grep -qs gnu.org; then +if ls --help 2>/dev/null | grep gnu.org >/dev/null; then export LS_OPTIONS="--color=auto -F -b --time-style=long-iso" elif [ "$SYSTEM" = "Darwin" ]; then export LS_OPTIONS="-G -F -b" -- 2.7.4