3 files changed, 23 insertions, 4 deletions
diff --git a/.zshrc b/.zshrc
index 212f280..a167e6c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -157,15 +157,15 @@ export WORDCHARS='*?_-[]~=&;!#$%^(){}'
 zmodload -i zsh/complist
 
 # Should dircolors exist. Fetch LS_COLORS from it.
-if [ `which dircolors` ]; then
+if [ "`which dircolors`" != 'dircolors not found' ]; then
     eval "$(dircolors -b)"
 fi
 
 zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
 zstyle ':completion:*:*:kill:*' list-colors '=%*=01;31'
 
-alias ls="ls --classify --color=always" # Add all colours and have fancy
-                                        # symbols for files, etc.
+alias ls="SUBSTS_LS --classify --color=always" # Add all colours and 
+                                        # have fancy symbols for files, etc.
 alias grep="grep --colour=always" # Colour grep too.
 # Load the completion system
 autoload -U compinit; compinit
@@ -560,6 +560,20 @@ noproxy() {
     unset http_proxy
 }
 
+gbp-snap() {
+    if [[ -e $@ ]]; then
+        git-dch -aSN $1
+    else
+        git-dch -aS
+    fi
+    gpg-mounter
+    gibuild --git-ignore-new
+    DSC=`head -n1 debian/changelog | sed -e 's/\(.*\) (\(.*\)).*/\1_\2.dsc/g'`
+    DIST=`head -n1 debian/changelog | sed -e 's/.* \(.*\);.*/\1/g'`
+    cd ..
+    sbuild -d $DIST $DSC
+}
+
 # Pretty menu!
 zstyle ':completion:*' menu select=1
 zstyle ':completion:*' select-prompt %SScroll active at %p%s.
diff --git a/SUBSTS b/SUBSTS
index 0790eed..26c8666 100644
--- a/SUBSTS
+++ b/SUBSTS
@@ -19,3 +19,6 @@ SCREENLAYOUT epsilon-SAIL
 PM_EMAIL pipemajor@example.org
 # Locale
 LOCALE es_ES.UTF-8
+
+# ls or gls command
+SUBSTS_LS ls
diff --git a/dm b/dm
index 6cee78a..448e0ba 100755
--- a/dm
+++ b/dm
@@ -58,6 +58,7 @@ XMONAD_DZEN_W = $(call get-val,XMONAD_DZEN_W)
 XMONAD_DZEN_X = $(call get-val,XMONAD_DZEN_X)
 XMONAD_DZEN_Y = $(call get-val,XMONAD_DZEN_Y)
 LOCALE	      = $(call get-val,LOCALE)
+SUBSTS_LS     = $(call get-val,SUBSTS_LS)
 
 # This target relies on GLOBAL_FILES being before LOCAL_FILES so that the
 # build/LOCAL_FILES targets overwrite what was copied in GLOBAL_FILES.
@@ -103,7 +104,8 @@ build/.xmonad/xmonad.hs: .xmonad/xmonad.hs $(SUBSTS_FILE)
 
 build/.zshrc: .zshrc $(SUBSTS_FILE)
 	[ -d $(dir $@) ] || mkdir -p $(dir $@)
-	sed -e 's/LOCALE/$(LOCALE)/g' $< > $@
+	sed -e 's/LOCALE/$(LOCALE)/g' \
+	    -e 's/SUBSTS_LS/$(SUBSTS_LS)/g' $< > $@
 
 build/%: %
 	[ -d $(dir $@) ] || mkdir -p $(dir $@)