Merge branch 'master' of http://git.distorted.org.uk/~mdw/profile

* 'master' of http://git.distorted.org.uk/~mdw/profile:
  bg/lilith.jpg: New image; painting by John Collier.
  dot/bashrc: Some hacking for Sailfish.

diff --git a/bg/lilith.jpg b/bg/lilith.jpg
new file mode 100644 (file)
index 0000000..789a281
Binary files /dev/null and b/bg/lilith.jpg differ

diff --git a/dot/bashrc b/dot/bashrc
index b723d8c..1b6d7af 100644 (file)
--- 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

diff --git a/setup b/setup
index 5422976..18e690b 100755 (executable)
--- a/setup
+++ b/setup
@@ -211,6 +211,7 @@ backgrounds="
   rayne.jpg
   hypatia.jpg
   noodly.jpg
+  lilith.jpg
   lovelace.jpg"
 if [ "$xstuff" ]; then
   echo "Installing backgrounds..."