From: Mark Wooding Date: Sat, 19 Jul 2014 14:20:30 +0000 (+0100) Subject: dot/bashrc: Some hacking for Sailfish. X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/0840478579e766d3b580bff2ca0d0b099306607e?ds=inline dot/bashrc: Some hacking for Sailfish. --- diff --git a/dot/bashrc b/dot/bashrc index b723d8c..1b6d7af 100644 --- a/dot/bashrc +++ b/dot/bashrc @@ -45,7 +45,7 @@ if [ -t 0 ]; then right=`echo » | iconv -f UTF-8 -t //translit` else case $USER in - mdw|mwooding) u="" left="[" right="]" ;; + mdw|mwooding|nemo) u="" left="[" right="]" ;; *) u="\\u@" left="{" right="}" ;; esac if [ "$__mdw_tty" = "`tty`" ]; then @@ -82,7 +82,7 @@ shopt -s cmdhist shopt -u dotglob shopt -s expand_aliases shopt -s extglob -shopt -s globstar +if (( ${BASH_VERSINFO[0]} >= 4 )); then shopt -s globstar; fi shopt -s gnu_errfmt shopt -s histappend shopt -s histreedit @@ -131,7 +131,7 @@ else unset LS_COLORS fi -ls () { +unalias ls 2>/dev/null || :; function ls () { if [ -t 1 ]; then command ls $LS_OPTIONS ${LS_COLORS+--color=auto} "$@" else