From 36115508f376c7a0701d0fbdf5dc086091ef20db Mon Sep 17 00:00:00 2001 From: rkowen Date: Tue, 22 Sep 2009 16:25:04 +0000 Subject: [PATCH] Changed the sed '\t' to a tab char so it would work on Solaris. --- init/bash.in | 2 +- init/csh.in | 2 +- init/ksh.in | 2 +- init/python.in | 2 +- init/sh.in | 2 +- init/zsh.in | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/init/bash.in b/init/bash.in index 65f0bb20..ed5581c6 100644 --- a/init/bash.in +++ b/init/bash.in @@ -20,7 +20,7 @@ if [ "${LOADEDMODULES:-}" = "" ]; then fi if [ "${MODULEPATH:-}" = "" ]; then - MODULEPATH=`sed -n 's/[ \t#].*$//; /./H; $ { x; s/^\n//; s/\n/:/g; p }' ${MODULESHOME}/init/.modulespath` + MODULEPATH=`sed -n 's/[ #].*$//; /./H; $ { x; s/^\n//; s/\n/:/g; p }' ${MODULESHOME}/init/.modulespath` export MODULEPATH fi diff --git a/init/csh.in b/init/csh.in index 194f4bc7..81c246f1 100644 --- a/init/csh.in +++ b/init/csh.in @@ -45,7 +45,7 @@ unset postfix setenv MODULESHOME @prefix@ if (! $?MODULEPATH ) then - setenv MODULEPATH `sed -n 's/[ \t#].*$//; /./H; $ { x; s/^\n//; s/\n/:/g; p }' ${MODULESHOME}/init/.modulespath` + setenv MODULEPATH `sed -n 's/[ #].*$//; /./H; $ { x; s/^\n//; s/\n/:/g; p }' ${MODULESHOME}/init/.modulespath` endif if (! $?LOADEDMODULES ) then diff --git a/init/ksh.in b/init/ksh.in index 1db35c16..60abaa8a 100644 --- a/init/ksh.in +++ b/init/ksh.in @@ -19,6 +19,6 @@ if [ "${LOADEDMODULES:-}" = "" ]; then fi if [ "${MODULEPATH:-}" = "" ]; then - MODULEPATH=`sed -n 's/[ \t#].*$//; /./H; $ { x; s/^\n//; s/\n/:/g; p }' ${MODULESHOME}/init/.modulespath` + MODULEPATH=`sed -n 's/[ #].*$//; /./H; $ { x; s/^\n//; s/\n/:/g; p }' ${MODULESHOME}/init/.modulespath` export MODULEPATH fi diff --git a/init/python.in b/init/python.in index e314ccc3..ed496689 100644 --- a/init/python.in +++ b/init/python.in @@ -8,7 +8,7 @@ import os, string @VERSIONING@os.environ['MODULESHOME'] = '@prefix@' if not os.environ.has_key('MODULEPATH'): - os.environ['MODULEPATH'] = os.popen("""sed -n 's/[ \t#].*$//; /./H; $ { x; s/^\\n//; s/\\n/:/g; p }' ${MODULESHOME}/init/.modulespath""").readline() + os.environ['MODULEPATH'] = os.popen("""sed -n 's/[ #].*$//; /./H; $ { x; s/^\\n//; s/\\n/:/g; p }' ${MODULESHOME}/init/.modulespath""").readline() if not os.environ.has_key('LOADEDMODULES'): os.environ['LOADEDMODULES'] = ''; diff --git a/init/sh.in b/init/sh.in index f6373717..98574ba6 100644 --- a/init/sh.in +++ b/init/sh.in @@ -19,6 +19,6 @@ if [ "${LOADEDMODULES:-}" = "" ]; then fi if [ "${MODULEPATH:-}" = "" ]; then - MODULEPATH=`sed -n 's/[ \t#].*$//; /./H; $ { x; s/^\n//; s/\n/:/g; p }' ${MODULESHOME}/init/.modulespath` + MODULEPATH=`sed -n 's/[ #].*$//; /./H; $ { x; s/^\n//; s/\n/:/g; p }' ${MODULESHOME}/init/.modulespath` export MODULEPATH fi diff --git a/init/zsh.in b/init/zsh.in index 0298e687..2b8b7432 100644 --- a/init/zsh.in +++ b/init/zsh.in @@ -19,6 +19,6 @@ if [ "${LOADEDMODULES:-}" = "" ]; then fi if [ "${MODULEPATH:-}" = "" ]; then - MODULEPATH=`sed -n 's/[ \t#].*$//; /./H; $ { x; s/^\n//; s/\n/:/g; p }' ${MODULESHOME}/init/.modulespath` + MODULEPATH=`sed -n 's/[ #].*$//; /./H; $ { x; s/^\n//; s/\n/:/g; p }' ${MODULESHOME}/init/.modulespath` export MODULEPATH fi