# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1384899158 28800
# Node ID f98fe4362c844617ac45f19838bfa278e7d45d11
# Parent  8ef38b16dcb9d8431c2e591faa2273443ebadb1f
finish

diff -r 8ef38b16dcb9 -r f98fe4362c84 .bash_mozilla
--- a/.bash_mozilla	Tue Nov 19 14:04:49 2013 -0800
+++ b/.bash_mozilla	Tue Nov 19 14:12:38 2013 -0800
@@ -2,6 +2,16 @@
 
 # mozilla-specific bash customizations
 
+# mozilla env vairables
+export MOZCONFIG=~/mozilla/mozconfigs/mozconfig
+export MOZSOURCE=~/mozilla/src/mozilla-central
+export MOZOBJ=~/mozilla/src/obj-browser
+unsetmozenv() {
+unset MOZCONFIG
+unset MOZSOURCE
+unset MOZOBJ
+env | sort
+}
 MOZCONFIGS=${HOME}/mozilla/mozconfigs
 MOZSRC=${HOME}/mozilla/src
 
diff -r 8ef38b16dcb9 -r f98fe4362c84 .bashrc
--- a/.bashrc	Tue Nov 19 14:04:49 2013 -0800
+++ b/.bashrc	Tue Nov 19 14:12:38 2013 -0800
@@ -31,17 +31,6 @@
 export JS_EDITLINE=1
 export JS_EDITLINE=1
 
-# mozilla env vairables
-export MOZCONFIG=~/mozilla/mozconfigs/mozconfig
-export MOZSOURCE=~/mozilla/src/mozilla-central
-export MOZOBJ=~/mozilla/src/obj-browser
-unsetmozenv() {
-unset MOZCONFIG
-unset MOZSOURCE
-unset MOZOBJ
-env | sort
-}
-
 # aliases
 alias awd="python -c 'import os;  print os.path.realpath(\".\")'"
 alias currentpatch='echo `hg root`/.hg/patches/`hg qapp -v | tail -n 1 | cut -f 3 -d " "`'
@@ -586,6 +575,12 @@
 ### include overrides for commands
 source ~/.bash_overrides
 
+### include mozilla customizations
+if [ -e ~/.bash_mozilla ]
+then
+    source ~/.bash_mozilla
+fi
+
 ### regenerate fluxbox menus here for convenience
 if type deactivate &> /dev/null
 then