Merge pull request #2263 from ganga-devs/mesmith75-patch-1

Update ganga-cvmfs-install.sh

ganga/GangaRelease/tools/ganga-cvmfs-install.sh

@@ -2,30 +2,22 @@
 
 cvmfs_server transaction ganga.cern.ch
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/cvmfs/sft.cern.ch/lcg/releases/LCG_100/Python/3.8.6/x86_64-centos7-gcc9-opt/lib
+conda activate ganga
 
 cd /cvmfs/ganga.cern.ch/Ganga/install
 
-/cvmfs/sft.cern.ch/lcg/releases/LCG_100/Python/3.8.6/x86_64-centos7-gcc9-opt/bin/python3 -m venv $1
+python -m venv $1
 
 . $1/bin/activate
 
 pip install --upgrade pip setuptools
 
-pip install ganga[LHCb]@git+https://github.com/ganga-devs/ganga.git@$1
-
-sed -i "23i\
-lib_string = '/cvmfs/sft.cern.ch/lcg/views/LCG_100/x86_64-centos7-gcc9-opt/lib64:/cvmfs/sft.cern.ch/lcg/views/LCG_100/x86_64-centos7-gcc9-opt/lib:/cvmfs/sft.cern.ch/lcg/releases/gcc/9.2.0-afc57/x86_64-centos7/lib:/cvmfs/sft.cern.ch/lcg/releases/gcc/9.2.0-afc57/x86_64-centos7/lib64'\n\
-sys.path.append('/cvmfs/sft.cern.ch/lcg/views/LCG_100/x86_64-centos7-gcc9-opt/lib/python3.8/site-packages')\n\
-if not 'LD_LIBRARY_PATH' in os.environ.keys():\n\
-    os.environ['LD_LIBRARY_PATH'] = lib_string\n\
-    os.execv(sys.argv[0], sys.argv)\n\
-elif not lib_string in os.environ['LD_LIBRARY_PATH']:\n\
-    os.environ['LD_LIBRARY_PATH'] += ':'+lib_string\n\
-    os.execv(sys.argv[0], sys.argv)" $1/bin/ganga
+pip install ganga[LHCb,Dirac]@git+https://github.com/ganga-devs/ganga.git@$1
 
 deactivate
 
+conda deactivate
+
 rm -f /cvmfs/ganga.cern.ch/Ganga/install/LATEST
 
 ln -s /cvmfs/ganga.cern.ch/Ganga/install/$1 /cvmfs/ganga.cern.ch/Ganga/install/LATEST