From 635a916ab62980b97118606ea6f440babdc67155 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sat, 30 Jul 2022 18:19:49 +0000
Subject: [PATCH] ATHENA_PREFIX -> EIC_SHELL_PREFIX
---
README.md | 2 +-
containers/jug/profile.d/z11_jug_env.sh | 8 ++++----
install.sh | 10 +++++-----
tests/tutorial/part1.sh | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index 7b3e04d70..8da67e603 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ eic-shell
```
4. Within your development environment (`eic-shell`), you can install software to the
- internal `$ATHENA_PREFIX`
+ internal `$EIC_SHELL_PREFIX`
Singularity Container setup for Development Usage
-------------
diff --git a/containers/jug/profile.d/z11_jug_env.sh b/containers/jug/profile.d/z11_jug_env.sh
index 615c48317..e6543caee 100755
--- a/containers/jug/profile.d/z11_jug_env.sh
+++ b/containers/jug/profile.d/z11_jug_env.sh
@@ -1,10 +1,10 @@
#!/bin/bash
export BINARY_TAG=x86_64-linux-gcc9-opt
-if [ ! -z ${ATHENA_PREFIX} ]; then
- if [ "$LD_LIBRARY_PATH" != *"${ATHENA_PREFIX}/lib"* ]; then
- export LD_LIBRARY_PATH=$ATHENA_PREFIX/lib:$LD_LIBRARY_PATH
- export PATH=$ATHENA_PREFIX/bin:$PATH
+if [ ! -z ${EIC_SHELL_PREFIX} ]; then
+ if [ "$LD_LIBRARY_PATH" != *"${EIC_SHELL_PREFIX}/lib"* ]; then
+ export LD_LIBRARY_PATH=$EIC_SHELL_PREFIX/lib:$LD_LIBRARY_PATH
+ export PATH=$EIC_SHELL_PREFIX/bin:$PATH
fi
fi
diff --git a/install.sh b/install.sh
index 637556bf8..56b89e940 100755
--- a/install.sh
+++ b/install.sh
@@ -4,7 +4,7 @@
## in your local environment under $PREFIX/local/lib
## and creates a simple top-level launcher script
## that launches the container for this working directory
-## with the $ATHENA_PREFIX variable pointing
+## with the $EIC_SHELL_PREFIX variable pointing
## to the $PREFIX/local directory
CONTAINER="jug_xl"
@@ -195,7 +195,7 @@ function install_singularity() {
done
## create a new top-level eic-shell launcher script
- ## that sets the ATHENA_PREFIX and then starts singularity
+ ## that sets the EIC_SHELL_PREFIX and then starts singularity
cat << EOF > eic-shell
#!/bin/bash
@@ -278,7 +278,7 @@ if [ ! -z \${UPGRADE} ]; then
exit 0
fi
-export ATHENA_PREFIX=$PREFIX/local
+export EIC_SHELL_PREFIX=$PREFIX/local
export SINGULARITY_BINDPATH=$BINDPATH
\${SINGULARITY:-$SINGULARITY} exec \${SINGULARITY_OPTIONS:-} \${SIF:-$SIF} eic-shell \$@
EOF
@@ -325,7 +325,7 @@ function install_docker() {
fi
## create a new top-level eic-shell launcher script
- ## that sets the magix PREFIX and then starts singularity
+ ## that sets the EIC_SHELL_PREFIX and then starts singularity
cat << EOF > eic-shell
#!/bin/bash
@@ -384,7 +384,7 @@ if [ ! -z \${UPGRADE} ]; then
exit 0
fi
-docker run $PLATFORM_FLAG $MOUNT -w=$PWD -it --rm -e ATHENA_PREFIX=$PREFIX/local $IMG eic-shell \$@
+docker run $PLATFORM_FLAG $MOUNT -w=$PWD -it --rm -e EIC_SHELL_PREFIX=$PREFIX/local $IMG eic-shell \$@
EOF
chmod +x eic-shell
diff --git a/tests/tutorial/part1.sh b/tests/tutorial/part1.sh
index 64d63b5ca..476a2df3b 100755
--- a/tests/tutorial/part1.sh
+++ b/tests/tutorial/part1.sh
@@ -4,7 +4,7 @@ source /opt/detector/setup.sh
git clone https://eicweb.phy.anl.gov/EIC/tutorials/ip6_tutorial_1.git part1
pushd part1
-cmake -B build -S . -DCMAKE_INSTALL_PREFIX=$ATHENA_PREFIX -DCMAKE_CXX_STANDARD=17
+cmake -B build -S . -DCMAKE_INSTALL_PREFIX=$EIC_SHELL_PREFIX -DCMAKE_CXX_STANDARD=17
cmake --build build -j4 -- install
dd_web_display --export gem_tracker.xml
checkOverlaps -t 0.0001 -c gem_tracker.xml
--
GitLab