update

Author: Samuel Moors

.github/workflows/end2end_bwrap.yml

@@ -60,26 +60,6 @@ jobs:
           cat > /tmp/check_bwrap_install.sh <<'EOF'
           #!/usr/bin/env bash
 
-          check_no_dir() {
-              local label="$1"
-              local path="$2"
-
-              echo ">>> CHECK: $label"
-              echo "    path: $path"
-
-              if [[ -d "$path" ]]; then
-                  echo "FAIL: directory exists"
-                  echo "Directory details:"
-                  ls -ld "$path" || true
-                  echo "Contents:"
-                  find "$path" -maxdepth 4 -print || true
-                  return 1
-              fi
-
-              echo "PASS: directory does not exist"
-              echo
-          }
-
           check_no_glob_matches() {
               local label="$1"
               local pattern="$2"
@@ -148,16 +128,16 @@ jobs:
               find /tmp/bwrap-installpath -maxdepth 5 -print || true
               echo
 
-              check_no_dir "no host UnZip module dir" \
-                  "$HOME/.local/easybuild/modules/all/UnZip" || failures=$((failures + 1))
+              check_no_glob_matches "no host UnZip modules" \
+                  "$HOME/.local/easybuild/modules/all/UnZip/*" || failures=$((failures + 1))
 
-              check_no_dir "no host bzip2 module dir" \
-                  "$HOME/.local/easybuild/modules/all/bzip2" || failures=$((failures + 1))
+              check_no_glob_matches "no host bzip2 modules" \
+                  "$HOME/.local/easybuild/modules/all/bzip2/*" || failures=$((failures + 1))
 
-              check_no_glob_matches "no host UnZip software payload" \
+              check_no_glob_matches "no host UnZip software files" \
                   "$HOME/.local/easybuild/software/UnZip/6.0/*" || failures=$((failures + 1))
 
-              check_no_glob_matches "no host bzip2 software payload" \
+              check_no_glob_matches "no host bzip2 software files" \
                   "$HOME/.local/easybuild/software/bzip2/1.0.8/*" || failures=$((failures + 1))
 
               check_path_exists "bwrap bzip2 module file exists" \
@@ -197,9 +177,6 @@ jobs:
           bash -l <<EOF
             source /tmp/eb_env
 
-            # remove previously created install directories
-            rm -r $HOME/.local/easybuild/{software,modules}/*
-
             # make sure that --prefix also determines default value for bwrap-installpath
             eb --show-config --prefix /tmp | grep "bwrap-installpath [ ]* \(C\) = /tmp/bwrap"