From a804d0436a98faffb6d3179697aaee9473548593 Mon Sep 17 00:00:00 2001
From: Aaron LI <aaronly.me@gmail.com>
Date: Wed, 6 Jan 2016 15:47:05 +0800
Subject: Update tcsh configurations

* Clean up tcshrc
* Clean up tcshrc.local
* Update tcsh/{ciaoinit,heainit}.csh
---
 .tcsh/ciaoinit.csh |  9 +++------
 .tcsh/heainit.csh  | 11 +++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to '.tcsh')

diff --git a/.tcsh/ciaoinit.csh b/.tcsh/ciaoinit.csh
index 3079cdc..8aa292b 100644
--- a/.tcsh/ciaoinit.csh
+++ b/.tcsh/ciaoinit.csh
@@ -2,20 +2,17 @@
 #
 # CIAO settings
 #
-unset printexitvalue
 
-set HEA_STATE="`echo $PATH | tr ':' '\n' | grep 'heasoft'`"
 set CIAO_STATE="`echo $PATH | tr ':' '\n' | grep 'ciao'`"
-if ( "x${HEA_STATE}" == "x" ) then
-    heainit
-endif
 if ( "x${CIAO_STATE}" == "x" ) then
     source $CIAO_PATH/bin/ciao.csh
 else
     source $CIAO_PATH/bin/ciao.csh -o
 endif
-unset HEA_STATE
 unset CIAO_STATE
 
+setenv CIAO_LD_LIBRARY_PATH "${ASCDS_INSTALL}/lib:${ASCDS_INSTALL}/ots/lib:${ASCDS_INSTALL}/ots/lib/vtk-5.10"
+setenv ASCDS_IMAGER_PATH "${ASCDS_INSTALL}/ots/saord"
+
 exit 0
 
diff --git a/.tcsh/heainit.csh b/.tcsh/heainit.csh
index c1a8a04..ddd6c1c 100644
--- a/.tcsh/heainit.csh
+++ b/.tcsh/heainit.csh
@@ -2,14 +2,13 @@
 #
 # HEASOFT settings
 #
-unset printexitvalue
 
-set HEA_STATE=`echo $PATH | tr ':' '\n' | grep 'heasoft'`
-if ( "x${HEA_STATE}" == "x" ) then
-    source $HEADAS/headas-init.csh
-endif
-unset HEA_STATE
+source $HEADAS/headas-init.csh
 # set HEA_LDLIB="`echo $LD_LIBRARY_PATH | tr ':' '\n' | grep 'heasoft' | head -n 1`"
 
+if ( $?LD_LIBRARY_PATH_BAK ) then
+    setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH_BAK}"
+endif
+
 exit 0
 
-- 
cgit v1.2.2