Startup hook changes.
Now, regardless of order, login's contents will apply first, even if not sourced first. Then tcshrc will kick off and run the core bits, as long as there is a terminal.
This commit is contained in:
@ -1,12 +1,17 @@
|
||||
set login_sourced
|
||||
if( ! $?CSHENV_LOGIN_SOURCED ) then
|
||||
setenv CSHENV_LOGIN_SOURCED
|
||||
|
||||
if( $?CSHENV_DEBUG ) then
|
||||
echo "Starting login..."
|
||||
endif
|
||||
|
||||
#if( ! $?CSHENV_DIR ) then
|
||||
#setenv CSHENV_DIR ~/proj/cshenv
|
||||
#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
|
||||
@ -23,15 +28,21 @@ endif
|
||||
#echo login hook lives at: ${CSHENV_LOGIN_PATH}
|
||||
|
||||
|
||||
if( $?CSHENV_DEBUG ) then
|
||||
echo "Ending login..."
|
||||
endif
|
||||
|
||||
###########################
|
||||
# vim: ft=tcsh
|
||||
###########################
|
||||
|
||||
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
|
||||
|
||||
endif
|
||||
|
||||
|
||||
###########################
|
||||
# vim: ft=tcsh
|
||||
###########################
|
||||
|
@ -1,17 +1,13 @@
|
||||
set tcshrc_sourced
|
||||
# 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
|
||||
|
||||
set CSHENV_TCSHRC_SOURCED
|
||||
|
||||
if( $?CSHENV_DEBUG ) then
|
||||
echo "Starting tcshrc..."
|
||||
endif
|
||||
|
||||
if( ! $?CSHENV_DIR ) then
|
||||
setenv CSHENV_DIR ~/proj/cshenv
|
||||
endif
|
||||
|
||||
if( $?CSHENV_DEBUG ) then
|
||||
echo "Setup CSHENV_DIR to: " ${CSHENV_DIR}
|
||||
endif
|
||||
|
||||
#if( -z ${_} ) then
|
||||
#echo $0
|
||||
#setenv CSHENV_TCSHRC_PATH $0
|
||||
@ -34,8 +30,8 @@ endif
|
||||
if( $?CSHENV_DEBUG ) then
|
||||
echo "Ending tcshrc..."
|
||||
endif
|
||||
endif
|
||||
|
||||
###########################
|
||||
# vim: ft=tcsh
|
||||
###########################
|
||||
|
||||
|
Reference in New Issue
Block a user