Skip to content
Snippets Groups Projects
Commit f33982e3 authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

Merge branch 'sly2j-master-patch-77049' into 'master'

Explicitly load eic-shell in launcher to be more resilient

See merge request !77
parents d53f7f5f 771aa934
No related branches found
No related tags found
1 merge request!77Explicitly load eic-shell in launcher to be more resilient
...@@ -162,24 +162,12 @@ done ...@@ -162,24 +162,12 @@ done
## create a new top-level eic-shell launcher script ## create a new top-level eic-shell launcher script
## that sets the ATHENA_PREFIX and then starts singularity ## that sets the ATHENA_PREFIX and then starts singularity
## need different script for old singularity versions
if [ ${SINGULARITY_VERSION:0:1} != 2 ]; then
## newer singularity
cat << EOF > eic-shell
#!/bin/bash
export ATHENA_PREFIX=$PREFIX/local
export SINGULARITY_BINDPATH=$BINDPATH
$SINGULARITY run $SIF
EOF
else
## ancient singularity
cat << EOF > eic-shell cat << EOF > eic-shell
#!/bin/bash #!/bin/bash
export ATHENA_PREFIX=$PREFIX/local export ATHENA_PREFIX=$PREFIX/local
export SINGULARITY_BINDPATH=$BINDPATH export SINGULARITY_BINDPATH=$BINDPATH
$SINGULARITY exec $SIF eic-shell $SINGULARITY exec $SIF eic-shell
EOF EOF
fi
chmod +x eic-shell chmod +x eic-shell
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment