From 607ecc569653074771edb6fadfaa3e9b43212766 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Mar=C3=ADa=20Fern=C3=A1ndez?=
 <jose.m.fernandez@bsc.es>
Date: Thu, 10 Aug 2023 20:38:09 +0200
Subject: [PATCH] Updated squashfuse installation script

---
 squashfuse-local-installer.bash | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/squashfuse-local-installer.bash b/squashfuse-local-installer.bash
index 2fdde4e7..6b3009dd 100755
--- a/squashfuse-local-installer.bash
+++ b/squashfuse-local-installer.bash
@@ -18,7 +18,7 @@
 # These are the software versions being installed
 # in the virtual environment
 APPTAINER_VER=1.2.2
-SQUASHFUSER_VER=0.2.0
+SQUASHFUSE_VER=0.2.0
 GO_VER=1.20.7
 
 # These are placeholders
@@ -38,7 +38,7 @@ case "${wfexsDir}" in
 	;;
 esac
 
-downloadDir="$(mktemp -d --tmpdir wfexs_apptainer_installer.XXXXXXXXXXX)"
+downloadDir="$(mktemp -d --tmpdir wfexs_squashfuse_installer.XXXXXXXXXXX)"
 echo "$0: ${downloadDir} will be used to download third party dependencies, and later removed"
 
 cleanup() {
@@ -58,10 +58,7 @@ if [ $# -gt 0 ]; then
 	if [ "$1" == "force" ] ; then
 		doForce=1
 		if [ $# -gt 1 ] ; then
-			APPTAINER_VER="$2"
-			if [ $# -gt 2 ] ; then
-				GO_VER="$3"
-			fi
+			SQUASHFUSE_VER="$2"
 		fi
 	fi
 fi
@@ -97,28 +94,25 @@ if [ -n "$failed" ] ; then
 fi
 
 
-# Now, it is time to check apptainer binaries availability
+# Now, it is time to check squashfuse binaries availability
 if [ -z "$doForce" ] ; then
-	if [ -x "${envDir}/bin/apptainer" ] ; then
-		echo "Apptainer $(apptainer version) is already available in the environment. Skipping install"
+	if [ -x "${envDir}/bin/squashfuse" ] ; then
+		echo "Squashfuse $("${envDir}/bin/squashfuse" --version 2>&1|head -n 1) is already available in the environment. Skipping install"
 		exit 0
 	fi
 fi
 
-# Compilation artifacts should go to the temporary download directory
-checkInstallGO "${GO_VER}" "${platformOS}" "${platformArchGO}" "${downloadDir}"
-
 # Fetch and compile apptainer
 squashfuseBundlePrefix=squashfuse-"${SQUASHFUSE_VER}"
 squashfuseBundle="${squashfuseBundlePrefix}".tar.gz
 
 ( cd "${downloadDir}" && curl -L -O https://github.com/vasi/squashfuse/archive/"${SQUASHFUSE_VER}"/"${squashfuseBundle}" )
 tar -x -z -C "${downloadDir}" -f "${downloadDir}/${squashfuseBundle}"
-# Removing apptainer bundle
+# Removing squashfuse bundle
 rm "${downloadDir}/${squashfuseBundle}"
 cd "${downloadDir}"/"${squashfuseBundlePrefix}"
 
-# Now, the right moment to compile and install rootless apptainer
+# Now, the right moment to compile and install rootless squashfuse
 ./autogen.sh
 CFLAGS=-std=c99 ./configure --enable-multithreading --prefix="${envDir}"
 make && make install