# HG changeset patch
# User huston@80426f53-59d1-405d-934b-f07cd76f4a1a
# Date 1239940944 0
# Node ID aa5e55aa62ef98f1e022bc898996e5efe75b1c31
# Parent  1e8e782fccab33d6be0ecf4dce8814c0dbf3976c
Moved specific section to top of .bash_aliases, so other bits can be set based
on it.  Then changed the sshfs mounts to add a ",volname=<foo>" on Macs
(cleaner mounts on the desktop).

diff -r 1e8e782fccab -r aa5e55aa62ef .bash_aliases
--- a/.bash_aliases	Mon Apr 13 03:38:53 2009 +0000
+++ b/.bash_aliases	Fri Apr 17 04:02:24 2009 +0000
@@ -1,3 +1,15 @@
+# Mac OS X specific
+[[ `uname` == "Darwin" ]] && {
+   # DARWIN is used for the SSHFS mounts below
+   DARWIN="yes"
+   alias ls='ls -FG'
+}
+
+# Linux specific
+[[ `uname` == "Linux" ]] && {
+   alias ls='ls --color=auto -F'
+}
+
 # SSH aliases
 alias dh='ssh srhuston.net'
 alias dvra='ssh dvra@laurel.dreamhost.com'
@@ -17,18 +29,9 @@
 alias vi='vim'
 
 # SSHFS mounts
-alias junkpile='sshfs -oreconnect,volname=Junkpile srhuston.net:junkpile ~/junkpile'
-alias sharm='sshfs -oreconnect harmonic.srhuston.net: ~/harmonic'
-alias sj='sshfs -oreconnect,volname=Joshua joshua.srhuston.net: ~/joshua'
-alias ssrh='sshfs -oreconnect srhuston.net: ~/srhuston.net'
-alias sx='sshfs -oreconnect xanadu.astro.princeton.edu: ~/xanadu'
-
-# Mac OS X specific
-[[ `uname` == "Darwin" ]] && {
-   alias ls='ls -FG'
-}
-
-# Linux specific
-[[ `uname` == "Linux" ]] && {
-   alias ls='ls --color=auto -F'
-}
+# The $DARWIN check fills in a nice volname if this is a Mac
+alias junkpile="sshfs -oreconnect${DARWIN:+,volname=Junkpile} srhuston.net:junkpile ~/junkpile"
+alias sharm="sshfs -oreconnect${DARWIN:+,volname=Harmonic} harmonic.srhuston.net: ~/harmonic"
+alias sj="sshfs -oreconnect${DARWIN:+,volname=Joshua} joshua.srhuston.net: ~/joshua"
+alias sdh="sshfs -oreconnect${DARWIN:+,volname=srhuston.net} srhuston.net: ~/srhuston.net"
+alias sx="sshfs -oreconnect${DARWIN:+,volname=Xanadu} xanadu.astro.princeton.edu: ~/xanadu"