tuning script output and behaviour

trz42 · Jun 4, 2024 · 119a6a5 · 119a6a5
1 parent d161829
commit 119a6a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/EESSI-install-software.sh b/EESSI-install-software.sh
@@ -258,7 +258,7 @@ fi
 
 # Install extra software that is needed (e.g., for providing a custom ctypes
 # library when needed)
-ls -l ${EESSI_CVMFS_REPO}/host_injections
+echo "Location of host_injections: $(ls -l ${EESSI_CVMFS_REPO}/host_injections)"
 ${EESSI_PREFIX}/scripts/extra/install_custom_ctypes.sh --temp-dir /tmp/temp
 
 # use PR patch file to determine in which easystack files stuff was added

diff --git a/scripts/extra/install_custom_ctypes.sh b/scripts/extra/install_custom_ctypes.sh
@@ -77,13 +77,10 @@ else
 fi
 echo "Created temporary directory '${tmpdir}'"
 
-# some logging
-echo ">>> Checking contents under '${NESSI_SITE_INSTALL}'"
-ls -lR ${NESSI_SITE_INSTALL}
-
 # check if custom_ctypes has already been installed
 if [[ -d ${NESSI_SITE_INSTALL}/lib ]]; then
-    fatal_error "Error: Installation of custom_ctypes already found at '${NESSI_SITE_INSTALL}'"
+    echo "INFO: Installation of custom_ctypes already found at '${NESSI_SITE_INSTALL}'"
+    exit 0
 fi
 
 # download custom_ctypes to temp directory