diff --git a/.gitignore b/.gitignore index 4ab0868aa5b88d0ca7883a6016ed43d06259ede4..1cb1974b441cd58b6ceba11260a6064572429c6a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ build BUILD debug DEBUG + +.nfs* diff --git a/install.sh b/install.sh index eae3dc69243708ff2a5a15c19de02400f113e882..66ea66ca767974fc8b4e291be0b8e52d12dabb51 100755 --- a/install.sh +++ b/install.sh @@ -26,14 +26,16 @@ if [ $(type -P singularity ) ]; then fi fi if [ -z $SINGULARITY ]; then + ## first priority: a known good install (this one is on JLAB) if [ -d "/apps/singularity/3.7.1/bin/" ]; then SINGULARITY="/apps/singularity/3.7.1/bin/singularity" - ## cvmfs singularity - elif [ -f "/cvmfs/oasis.opensciencegrid.org/mis/singularity/bin/singularity" ]; then - SINGULARITY="/cvmfs/oasis.opensciencegrid.org/mis/singularity/bin/singularity" - ## whatever is in the path + ## whatever is in the path is next elif [ $(type -P singularity ) ]; then SINGULARITY=$(which singularity) + ## cvmfs singularity is last resort (sandbox mode can cause issues) + elif [ -f "/cvmfs/oasis.opensciencegrid.org/mis/singularity/bin/singularity" ]; then + SINGULARITY="/cvmfs/oasis.opensciencegrid.org/mis/singularity/bin/singularity" + ## not good... else echo "ERROR: no singularity found, please make sure you have singularity in your \$PATH" exit 1