From 721dde550c5c4c48e307f79638c8231790e01e40 Mon Sep 17 00:00:00 2001
From: jmcarcell <jmcarcell@users.noreply.github.com>
Date: Sun, 29 Sep 2024 20:59:55 +0200
Subject: [PATCH] Update the setup script

---
 scripts/cvmfs/setup-nightlies.sh | 63 +++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 26 deletions(-)

diff --git a/scripts/cvmfs/setup-nightlies.sh b/scripts/cvmfs/setup-nightlies.sh
index 1aa0b418..ce0c5ad1 100644
--- a/scripts/cvmfs/setup-nightlies.sh
+++ b/scripts/cvmfs/setup-nightlies.sh
@@ -3,9 +3,9 @@
 # This script sets up the Key4hep software stack from CVMFS for the nightlies
 
 function usage() {
-    echo "Usage: source /cvmfs/sw-nightlies.hsf.org/key4hep/setup.sh [-r <release>] [-d] [--list-releases [distribution]] [--list-packages [distribution]]"
-    echo "       -d           : setup the debug version of the software stack"
+    echo "Usage: source /cvmfs/sw-nightlies.hsf.org/key4hep/setup.sh [-c <compiler>] [-r <release>] [-d] [--list-releases [distribution]] [--list-packages [distribution]]"
     echo "       -c           : select compiler, system or gcc14 (default) on AlmaLinux 9, system for the other OSes"
+    echo "       -d           : setup the debug version of the software stack"
     echo "       -r <release> : setup a specific release, if not specified the latest release will be used (also used for --list-packages)"
     echo "       --help, -h   : print this help message"
     echo "       --list-releases [distribution] : list available releases for the specified distribution (almalinux, centos, ubuntu). By default (no OS is specified) it will list the releases for the detected distribution"
@@ -25,13 +25,16 @@ if [[ "$1" = "-r" && -n "$2" && (! -d "/cvmfs/sw-nightlies.hsf.org/key4hep/relea
 }
 
 function list_releases() {
-    if [ ! -n "$1" ]; then
+    if [ -z "$1" ]; then
         os=$os
     else
         os=$1
     fi
     if [ "$os" = "almalinux" ] || [ "$os" = "almalinux9" ]; then
         name="almalinux9"
+        if [ -z "$compiler" ]; then
+            compiler="gcc14"
+        fi
     elif [ "$os" = "ubuntu" ] || [ "$os" = "ubuntu22" ]; then
         name="ubuntu22"
     else
@@ -39,18 +42,23 @@ function list_releases() {
         usage
         return 1
     fi
-    find /cvmfs/sw-nightlies.hsf.org/key4hep/releases/ -maxdepth 2 -type d -name "*$name*$build_type*" |
+    echo "Compiler is $compiler"
+    find /cvmfs/sw-nightlies.hsf.org/key4hep/releases/ -maxdepth 2 -type d -name "*$name*$compiler*$build_type*" |
     \awk -F/ '{print $(NF-1)}' | sort
+    unset compiler
 }
 
 function list_packages() {
-    if [ ! -n "$1" ]; then
+    if [ -z "$1" ]; then
         os=$os
     else
         os=$1
     fi
     if [ "$os" = "almalinux" ] || [ "$os" = "almalinux9" ]; then
         name="almalinux9"
+        if [ -z "$compiler" ]; then
+            compiler="gcc14"
+        fi
     elif [ "$os" = "ubuntu" ] || [ "$os" = "ubuntu22" ]; then
         name="ubuntu22"
     else
@@ -62,7 +70,7 @@ function list_packages() {
     previous_scratch_releases=()
     while IFS= read -r line; do
         previous_scratch_releases+=("$line")
-    done < <(find /cvmfs/sw-nightlies.hsf.org/key4hep/releases/ -maxdepth 3 -mindepth 3 -type f -name ".scratch" | grep "$name" | grep opt | sort | xargs -n1 dirname)
+    done < <(find /cvmfs/sw-nightlies.hsf.org/key4hep/releases/ -maxdepth 3 -mindepth 3 -type f -name ".scratch" | grep "$name" | grep "$compiler" | grep opt | sort | xargs -n1 dirname)
     for release in "${previous_scratch_releases[@]}"; do
         # Get the latest previous or equal date
         if [[ "$(basename $(dirname $release))" = "$rel" ]] || [[ "$(basename $(dirname $release))" < "$rel" ]]; then
@@ -76,31 +84,34 @@ function list_packages() {
     if [ $build_type = "dbg" ] && [ -d $(echo $latest_previous_release | sed 's/opt/dbg/') ]; then
         folders+=($(echo $latest_previous_release | sed 's/opt/dbg/'))
     fi
-    folders+=(/cvmfs/sw-nightlies.hsf.org/key4hep/releases/$rel/*$name*-*$build_type*)
+    folders+=(/cvmfs/sw-nightlies.hsf.org/key4hep/releases/$rel/*$name*$compiler*-*$build_type*)
 
-    declare -a package_versions
-    package_versions=()
+    declare -A package_versions
 
     for folder in "${folders[@]}"; do
         for package in $(ls $folder); do
             package_name=$(basename "$package")
             version_string=$(ls $folder/$package_name -t | head -n 1)
             package_version=$(echo "$version_string" | awk '{if ($NF ~ /develop/) {split($NF,arr,"_"); printf "%s", arr[1]} else {split($(NF),arr,"-"); printf "%s", arr[1]; for (i=2; i<length(arr); i++) printf "-%s", arr[i] } printf "\n" }')
-
-            # Update the version of the package in the associative array
-            if [[ " ${package_versions[@]} " =~ "${package_name}" ]]; then
-                package_versions=("${package_versions[@]/$package_name=*/$package_name=$package_version}")
-            else
-                package_versions+=("$package_name=$package_version")
-            fi
+            package_versions["$package_name"]="$package_version"
         done
     done
 
-    # Print the final version of each package
-    for pair in "${package_versions[@]}"; do
-        echo ${pair%%=*} ${pair#*=}
-    done
+    # Print the final version for each package
+    if [ -z "$ZSH_VERSION" ]; then
+        # Bash
+        for package_name in $(printf "%s\n" "${!package_versions[@]}" | sort); do
+            package_version="${package_versions[$package_name]}"
+            echo "$package_name $package_version"
+        done
+    else
+        # Zsh
+        for key in ${(ok)package_versions}; do
+            echo "$key $package_versions[$key]" | tr -d '"'
+        done
+    fi
 
+    unset compiler
 }
 
 
@@ -211,7 +222,7 @@ for ((i=1; i<=$#; i++)); do
             ;;
         -c)
             if [ "$os" = "almalinux9" ]; then
-                if [ ! -n "$argn" ]; then
+                if [ -z "$argn" ]; then
                     compiler="gcc14"
                     echo "No compiler specified, using the default gcc 14.2.1 compiler"
                 elif [ "$argn" = "system" ]; then
@@ -219,7 +230,7 @@ for ((i=1; i<=$#; i++)); do
                     echo "Using the system compiler"
                 elif [ "$argn" = "gcc11" ]; then
                     compiler="gcc11"
-                    echo "Using the gcc 11.4 compiler"
+                    echo "Using the GCC 11.4 compiler"
                 else
                     echo "Unsupported compiler $argn, aborting..."
                     usage
@@ -232,7 +243,7 @@ for ((i=1; i<=$#; i++)); do
             fi
             ;;
         --list-releases)
-            if [ ! -n "$argn" ]; then
+            if [ -z "$argn" ]; then
                 list_releases $os
                 return 0
             elif [ -n "$argn" ] && [[ "$argn" =~ ^(almalinux|ubuntu) ]]; then
@@ -245,7 +256,7 @@ for ((i=1; i<=$#; i++)); do
             fi
             ;;
         --list-packages)
-            if [ ! -n "$argn" ]; then
+            if [ -z "$argn" ]; then
                 list_packages $os
                 return 0
             elif [ -n "$argn" ] && [[ "$argn" =~ ^(almalinux|ubuntu) ]]; then
@@ -263,7 +274,7 @@ for ((i=1; i<=$#; i++)); do
             ;;
         *)
             eval "prev=\${$((i-1))}"
-            if [ "$prev" != "-r" ]; then
+            if [ "$prev" != "-r" ] && [ "$prev" != "-c" ]; then
                 echo "Unknown argument $arg, it will be ignored"
                 # usage
                 # return 1
@@ -272,7 +283,7 @@ for ((i=1; i<=$#; i++)); do
     esac
 done
 
-if [ ! -n "$compiler" ]; then
+if [ -z "$compiler" ]; then
     if [ "$os" = "almalinux9" ]; then
         compiler="gcc14"
         echo "No compiler specified, using the default gcc 14.2.1 compiler"