From 8f043343fb652782d83455c1c0bcb36dde49708a Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Fri, 27 Jan 2023 17:56:10 +0000
Subject: [PATCH] Trusa Grid env fix

---
 Grid/systems/tursa/env.sh             | 8 +++-----
 Grid/systems/tursa/spack-bootstrap.sh | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Grid/systems/tursa/env.sh b/Grid/systems/tursa/env.sh
index 9534176..5e6aa7d 100644
--- a/Grid/systems/tursa/env.sh
+++ b/Grid/systems/tursa/env.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC1091
 
-GRIDENVDIR="$(dirname "$(readlink -f "${BASH_SOURCE:-$0}")")"
-export GRIDENVDIR
-export PATH="${GRIDENVDIR}/prefix/base/bin:${PATH}"
-export ACLOCAL_PATH="${GRIDENVDIR}/prefix/base/share/aclocal:${ACLOCAL_PATH}"
-source "${GRIDENVDIR}"/spack/share/spack/setup-env.sh
+env_dir="$(dirname "$(readlink -f "${BASH_SOURCE:-$0}")")"
+source "${env_dir}/spack/share/spack/setup-env.sh"
+spack load jq git
diff --git a/Grid/systems/tursa/spack-bootstrap.sh b/Grid/systems/tursa/spack-bootstrap.sh
index 582cb93..01f3019 100755
--- a/Grid/systems/tursa/spack-bootstrap.sh
+++ b/Grid/systems/tursa/spack-bootstrap.sh
@@ -166,7 +166,7 @@ spack install ucx@1.12.0.CPU%gcc@9.4.0 openmpi@4.1.1.CPU%gcc@9.4.0
 cd "${cwd}"
 
 # environments #################################################################
-dev_tools=("autoconf" "automake" "libtool" "jq")
+dev_tools=("autoconf" "automake" "libtool" "jq" "git")
 ompi_gpu_hash=$(spack find --format "{hash}" openmpi@4.1.1.GPU)
 ompi_cpu_hash=$(spack find --format "{hash}" openmpi@4.1.1.CPU)
 
@@ -190,6 +190,8 @@ spack add openssl gmp mpfr c-lime
 spack install
 spack env deactivate
 
+spack install jq git
+
 # Final setup ##################################################################
 spack clean
 spack gc -y
@@ -199,7 +201,3 @@ spack config --scope site add 'modules:prefix_inspections:lib:[LD_LIBRARY_PATH,L
 spack config --scope site add 'modules:prefix_inspections:lib64:[LD_LIBRARY_PATH,LIBRARY_PATH]'
 spack config --scope site add 'modules:prefix_inspections:include:[C_INCLUDE_PATH,CPLUS_INCLUDE_PATH,INCLUDE]'
 spack module tcl refresh -y
-
-# permission change for group access
-chmod -R g+rw "${dir}/spack/var/spack/cache"
-setfacl -d -R -m g::rwX "${dir}/spack/var/spack/cache"