comparison .bashrc @ 58:5ae5253cbcc1

* Started making updates for module usage, needs to be finished. * Changed rpmmacros so it actually works on xanadu-vm (can this be normalized across hosts?)
author huston@80426f53-59d1-405d-934b-f07cd76f4a1a
date Sun, 19 Feb 2012 19:00:56 +0000
parents 44c36681ca0f
children 15f662bc38c8
comparison
equal deleted inserted replaced
57:bb24419b885f 58:5ae5253cbcc1
35 esac 35 esac
36 36
37 # 37 #
38 # Paths 38 # Paths
39 # 39 #
40
41 # A test for modules, to be implemented in time:
42 # if [ "`type -t module`" == "function" ]; then
43 # module load foo
44 # fi
45
40 # Standard-ish paths; some of these may be in place already, but if 46 # Standard-ish paths; some of these may be in place already, but if
41 # they're not they should probably go near the front of the pack. 47 # they're not they should probably go near the front of the pack.
42 for P in /sbin /usr/sbin /usr/local/bin /usr/local/sbin \ 48 for P in /sbin /usr/sbin /usr/local/bin /usr/local/sbin \
43 /opt/local/bin /opt/local/sbin /usr/X11R6/bin; do 49 /opt/local/bin /opt/local/sbin /usr/X11R6/bin; do
44 if [ -d $P ]; then 50 if [ -d $P ]; then
106 [[ $MANPATH =~ (^|:)$D/man($|:) ]] || \ 112 [[ $MANPATH =~ (^|:)$D/man($|:) ]] || \
107 export MANPATH=$D/man:${MANPATH:+$MANPATH} 113 export MANPATH=$D/man:${MANPATH:+$MANPATH}
108 fi 114 fi
109 done 115 done
110 116
111 # Add-ons for Intel compilers at work, and Condor 117 ## Add-ons for Intel compilers at work, and Condor
112 INTEL_ARCH='' 118 #INTEL_ARCH=''
113 case `uname -p` in 119 #case `uname -p` in
114 i[3456]86) 120 # i[3456]86)
115 INTEL_ARCH="ia32" 121 # INTEL_ARCH="ia32"
116 ;; 122 # ;;
123 #
124 # x86_64)
125 # INTEL_ARCH="intel64"
126 # ;;
127 #esac
128 #[[ "$INTEL_ARCH" ]] && {
129 # [[ $PATH =~ (^|:)/usr/peyton/intel ]] || {
130 # [[ -f /usr/peyton/intel/11.0/bin/iccvars.sh ]] && \
131 # . /usr/peyton/intel/11.0/bin/iccvars.sh $INTEL_ARCH
132 # [[ -f /usr/peyton/intel/11.0/bin/ifortvars.sh ]] && \
133 # . /usr/peyton/intel/11.0/bin/ifortvars.sh $INTEL_ARCH
134 # }
135 #}
117 136
118 x86_64) 137 #if [ -f /u/condor/condor-setup.sh ]; then
119 INTEL_ARCH="intel64" 138 # [[ $PATH =~ (^|:)/u/condor/hosts/`hostname -s`/sbin($|:) ]] || {
120 ;; 139 # export PATH=${PATH:+$PATH:}/u/condor/hosts/`hostname -s`/sbin
121 esac 140 # . /u/condor/condor-setup.sh
122 [[ "$INTEL_ARCH" ]] && { 141 # }
123 [[ $PATH =~ (^|:)/usr/peyton/intel ]] || { 142 #fi
124 [[ -f /usr/peyton/intel/11.0/bin/iccvars.sh ]] && \
125 . /usr/peyton/intel/11.0/bin/iccvars.sh $INTEL_ARCH
126 [[ -f /usr/peyton/intel/11.0/bin/ifortvars.sh ]] && \
127 . /usr/peyton/intel/11.0/bin/ifortvars.sh $INTEL_ARCH
128 }
129 }
130
131 if [ -f /u/condor/condor-setup.sh ]; then
132 [[ $PATH =~ (^|:)/u/condor/hosts/`hostname -s`/sbin($|:) ]] || {
133 export PATH=${PATH:+$PATH:}/u/condor/hosts/`hostname -s`/sbin
134 . /u/condor/condor-setup.sh
135 }
136 fi
137 143
138 # Now make sure $HOME/bin is top of the list (or at least present) 144 # Now make sure $HOME/bin is top of the list (or at least present)
139 if [ -d $HOME/bin ]; then 145 if [ -d $HOME/bin ]; then
140 [[ $PATH =~ (^|:)$HOME/bin($|:) ]] || \ 146 [[ $PATH =~ (^|:)$HOME/bin($|:) ]] || \
141 export PATH=$HOME/bin${PATH:+:$PATH} 147 export PATH=$HOME/bin${PATH:+:$PATH}