Mercurial > index.cgi > dotfiles
changeset 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 | bb24419b885f |
| children | 301977c12bb2 |
| files | .bashrc .rpmmacros |
| diffstat | 2 files changed, 32 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/.bashrc Sun Feb 19 18:58:16 2012 +0000 +++ b/.bashrc Sun Feb 19 19:00:56 2012 +0000 @@ -37,6 +37,12 @@ # # Paths # + +# A test for modules, to be implemented in time: +# if [ "`type -t module`" == "function" ]; then +# module load foo +# fi + # Standard-ish paths; some of these may be in place already, but if # they're not they should probably go near the front of the pack. for P in /sbin /usr/sbin /usr/local/bin /usr/local/sbin \ @@ -108,32 +114,32 @@ fi done -# Add-ons for Intel compilers at work, and Condor -INTEL_ARCH='' -case `uname -p` in - i[3456]86) - INTEL_ARCH="ia32" - ;; +## Add-ons for Intel compilers at work, and Condor +#INTEL_ARCH='' +#case `uname -p` in +# i[3456]86) +# INTEL_ARCH="ia32" +# ;; +# +# x86_64) +# INTEL_ARCH="intel64" +# ;; +#esac +#[[ "$INTEL_ARCH" ]] && { +# [[ $PATH =~ (^|:)/usr/peyton/intel ]] || { +# [[ -f /usr/peyton/intel/11.0/bin/iccvars.sh ]] && \ +# . /usr/peyton/intel/11.0/bin/iccvars.sh $INTEL_ARCH +# [[ -f /usr/peyton/intel/11.0/bin/ifortvars.sh ]] && \ +# . /usr/peyton/intel/11.0/bin/ifortvars.sh $INTEL_ARCH +# } +#} - x86_64) - INTEL_ARCH="intel64" - ;; -esac -[[ "$INTEL_ARCH" ]] && { - [[ $PATH =~ (^|:)/usr/peyton/intel ]] || { - [[ -f /usr/peyton/intel/11.0/bin/iccvars.sh ]] && \ - . /usr/peyton/intel/11.0/bin/iccvars.sh $INTEL_ARCH - [[ -f /usr/peyton/intel/11.0/bin/ifortvars.sh ]] && \ - . /usr/peyton/intel/11.0/bin/ifortvars.sh $INTEL_ARCH - } -} - -if [ -f /u/condor/condor-setup.sh ]; then - [[ $PATH =~ (^|:)/u/condor/hosts/`hostname -s`/sbin($|:) ]] || { - export PATH=${PATH:+$PATH:}/u/condor/hosts/`hostname -s`/sbin - . /u/condor/condor-setup.sh - } -fi +#if [ -f /u/condor/condor-setup.sh ]; then +# [[ $PATH =~ (^|:)/u/condor/hosts/`hostname -s`/sbin($|:) ]] || { +# export PATH=${PATH:+$PATH:}/u/condor/hosts/`hostname -s`/sbin +# . /u/condor/condor-setup.sh +# } +#fi # Now make sure $HOME/bin is top of the list (or at least present) if [ -d $HOME/bin ]; then