Skip to content

Commit e4a3b57

Browse files
author
Irving, Christopher
committed
Merge pull request #65 in APS/sdsc-roll from release/remove-from-lib-path to master
* commit '34440b1f8ecabfc09b1cb54188be2601b1251cd6': Removed logic that adds libs LD_LIBRARY_PATH and python 2.6 related checks
2 parents 8c1fc07 + 34440b1 commit e4a3b57

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

src/sdsc-etc-profile/all-sdsc.csh

-8
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,6 @@ if (-d /opt/sdsc/lib) then
55
else if ( "$PYTHONPATH" !~ */opt/sdsc/lib* ) then
66
setenv PYTHONPATH ${PYTHONPATH}:/opt/sdsc/lib
77
endif
8-
if (-d /opt/sdsc/lib/lib/python2.6/site-packages) then
9-
setenv PYTHONPATH ${PYTHONPATH}:/opt/sdsc/lib/python2.6/site-packages
10-
endif
11-
if (! $?LD_LIBRARY_PATH) then
12-
setenv LD_LIBRARY_PATH /opt/sdsc/lib
13-
else if ( "$LD_LIBRARY_PATH" !~ */opt/sdsc/lib* ) then
14-
setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:/opt/sdsc/lib
15-
endif
168
endif
179

1810
# Add sdsc scripts to path

src/sdsc-etc-profile/all-sdsc.sh

-8
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,6 @@ if test -d /opt/sdsc/lib; then
55
elif ! [[ "${PYTHONPATH}" =~ "/opt/sdsc/lib" ]]; then
66
export PYTHONPATH=${PYTHONPATH}:/opt/sdsc/lib
77
fi
8-
if test -d /opt/sdsc/lib/lib/python2.6/site-packages; then
9-
export PYTHONPATH=${PYTHONPATH}:/opt/sdsc/lib/python2.6/site-packages
10-
fi
11-
if test -z "${LD_LIBRARY_PATH}"; then
12-
export LD_LIBRARY_PATH=/opt/sdsc/lib
13-
elif ! [[ "${LD_LIBRARY_PATH}" =~ "/opt/sdsc/lib" ]]; then
14-
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/sdsc/lib
15-
fi
168
fi
179

1810
# Add sdsc scripts to path

0 commit comments

Comments
 (0)