Altered startup to now ignore login.

Relog and ls aliases also added.

startup_hooks/login

@@ -5,14 +5,6 @@ if( ! $?CSHENV_LOGIN_SOURCED ) then
         echo "Starting login..."
     endif
 
-    if( ! $?CSHENV_DIR ) then
-        setenv CSHENV_DIR ~/cshenv
-    endif
-
-    if( $?CSHENV_DEBUG ) then
-        echo "Set CSHENV_DIR to: " ${CSHENV_DIR}
-    endif
-
     #echo "Under: " $_
     #echo "Zero: " $0
 
@@ -28,17 +20,12 @@ if( ! $?CSHENV_LOGIN_SOURCED ) then
     #echo login hook lives at: ${CSHENV_LOGIN_PATH}
 
 
-    setenv LC_NUMERIC en_US.UTF-8
-    setenv LC_MEASUREMENT en_US.UTF-8
-    setenv LC_MONETARY en_US.UTF-8
-    setenv LC_TIME en_US.UTF-8
-
     if( $?CSHENV_DEBUG ) then
         echo "Ending login..."
     endif
 
     # Chain off to tcshrc, afterwards, if login hasn't been sourced
-    source ${CSHENV_DIR}/startup_hooks/tcshrc
+    # source ${CSHENV_DIR}/startup_hooks/tcshrc
 
 endif
 

startup_hooks/tcshrc

@@ -1,6 +1,23 @@
-# Only take this file in, if LOGIN is sourced.  LOGIN will be sourced
-# first, therefore, and will chain off to this.
-if( $?CSHENV_LOGIN_SOURCED && ! $?CSHENV_TCSHRC_SOURCED ) then
+# This file will always be taken in.  .login is now
+# vestigial, and doesn't matter if first or second.
+
+# These are the bits that would be in login:
+
+if( ! $?CSHENV_DIR ) then
+    setenv CSHENV_DIR ~/cshenv
+endif
+
+if( $?CSHENV_DEBUG ) then
+    echo "Set CSHENV_DIR to: " ${CSHENV_DIR}
+endif
+
+setenv LC_NUMERIC en_US.UTF-8
+setenv LC_MEASUREMENT en_US.UTF-8
+setenv LC_MONETARY en_US.UTF-8
+setenv LC_TIME en_US.UTF-8
+
+
+# These are the bits that are in tcshrc
 
 set CSHENV_TCSHRC_SOURCED
 
@@ -30,7 +47,6 @@ if( $?CSHENV_LOGIN_SOURCED && ! $?CSHENV_TCSHRC_SOURCED ) then
 if( $?CSHENV_DEBUG ) then
     echo "Ending tcshrc..."
 endif
-endif
 
 ###########################
 # vim: ft=tcsh

tcshrc.aliases

@@ -1,3 +1,9 @@
+# CSHENV Aliases:
+
+alias resource source ${CSHENV_DIR}/tcshrc
+alias relog resource
+alias rl relog
+
 #Classic UNIXy aliases
 
 #Dir motion
@@ -5,6 +11,8 @@ alias pd	pushd
 alias pu	pushd
 alias po	popd
 
+alias l ls
+
 #Standard ls aliases that I use:
 alias ll l -l
 alias la l -a