From f0bd019a82046a5b5f1ba4b8a94af38e1d6610c6 Mon Sep 17 00:00:00 2001
From: ADAM David Alan Martin <amartin172@bloomberg.net>
Date: Mon, 27 Jan 2014 19:03:04 -0500
Subject: [PATCH] Reworked sourcing order to something more sensible

---
 tcshrc | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/tcshrc b/tcshrc
index f356cb9..03244c3 100644
--- a/tcshrc
+++ b/tcshrc
@@ -82,21 +82,18 @@ endif
 setenv LSCOLORS 'ExFxcxdxbxegedabagacEB'
 setenv CLICOLOR_FORCE
 
-if( $?CSHENV_DEBUG ) then
-	echo "Trying to source tcshrc.aliases"
-endif
-source ${CSHENV_DIR}/tcshrc.aliases
-
-if( $?CSHENV_DEBUG ) then
-	echo "Trying to source tcshrc.bindkeys"
-endif
-source ${CSHENV_DIR}/tcshrc.bindkeys
-
 if( $?CSHENV_DEBUG ) then
 	echo "Trying to source tcshrc.${CSHENV_SYSTEM}"
 endif
 safe_source ${CSHENV_DIR}/tcshrc.${CSHENV_SYSTEM}
 
+# Having figured out the system, then we can load specific aliases
+
+if( $?CSHENV_DEBUG ) then
+	echo "Trying to source tcshrc.aliases"
+endif
+source ${CSHENV_DIR}/tcshrc.aliases
+
 if( $?CSHENV_DEBUG ) then
 	echo "Trying to source tcshrc.${CSHENV_HOSTNAME}"
 endif
@@ -106,6 +103,11 @@ if( $?CSHENV_ORGANIZATION ) then
     safe_source ${CSHENV_DIR}/tcshrc.${CSHENV_ORGANIZATION}
 endif
 
+if( $?CSHENV_DEBUG ) then
+	echo "Trying to source tcshrc.bindkeys"
+endif
+source ${CSHENV_DIR}/tcshrc.bindkeys
+
 set path=( ${path} /usr/sbin /sbin )
 
 # TCSHRC Prompt is the LAST thing we do, since it's the entry to