Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes env var #1221

Merged
merged 3 commits into from Jul 5, 2018
Merged

Fixes env var #1221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa8cd82
Fix wrong environment variable name
Barthelemy Jul 5, 2018
66f1b63
Fix wrong case for env var
Barthelemy Jul 5, 2018
be9e3b2
Fix spurious \n
Barthelemy Jul 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions configuration.sh
View file
Open in desktop
Expand Up @@ -51,9 +51,9 @@ module load BASE/1.0 \\
${PPCONSUL_VERSION:+Ppconsul/$PPCONSUL_VERSION-$PPCONSUL_REVISION}

# Our environment
setenv Configuration_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
prepend-path PATH \$::env(Configuration_ROOT)/bin
prepend-path LD_LIBRARY_PATH \$::env(Configuration_ROOT)/lib
setenv CONFIGURATION_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
prepend-path PATH \$::env(CONFIGURATION_ROOT)/bin
prepend-path LD_LIBRARY_PATH \$::env(CONFIGURATION_ROOT)/lib
$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(BASEDIR)/$PKGNAME/\$version/lib")
EoF
mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
8 changes: 4 additions & 4 deletions monitoring.sh
View file
Open in desktop
Expand Up @@ -42,9 +42,9 @@ module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@
module load BASE/1.0 ${BOOST_VERSION:+boost/$BOOST_VERSION-$BOOST_REVISION} ${APMON_CPP_VERSION:+ApMon-CPP/$APMON_CPP_VERSION-$APMON_CPP_REVISION} ${GCC_TOOLCHAIN_VERSION:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION}

# Our environment
setenv Monitoring_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
prepend-path PATH \$::env(Monitoring_ROOT)/bin
prepend-path LD_LIBRARY_PATH \$::env(Monitoring_ROOT)/lib
$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(Monitoring_ROOT)/lib")
setenv MONITORING_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
prepend-path PATH \$::env(MONITORING_ROOT)/bin
prepend-path LD_LIBRARY_PATH \$::env(MONITORING_ROOT)/lib
$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(MONITORING_ROOT)/lib")
EoF
mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
8 changes: 4 additions & 4 deletions readout.sh
View file
Open in desktop
Expand Up @@ -62,9 +62,9 @@ module load BASE/1.0 \\
FairRoot/$FAIRROOT_VERSION-$FAIRROOT_REVISION

# Our environment
setenv INFOLOGGER_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
prepend-path PATH \$::env(INFOLOGGER_ROOT)/bin
prepend-path LD_LIBRARY_PATH \$::env(INFOLOGGER_ROOT)/lib
$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(INFOLOGGER_ROOT)/lib")
setenv READOUT_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
prepend-path PATH \$::env(READOUT_ROOT)/bin
prepend-path LD_LIBRARY_PATH \$::env(READOUT_ROOT)/lib
$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(READOUT_ROOT)/lib")
EoF
mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles