From 119a6a57463bd795de906f956fbf8a6952015554 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Tue, 4 Jun 2024 18:36:45 +0200 Subject: [PATCH] tuning script output and behaviour --- EESSI-install-software.sh | 2 +- scripts/extra/install_custom_ctypes.sh | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/EESSI-install-software.sh b/EESSI-install-software.sh index bfd47a5139..7d6cad7add 100755 --- 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 index 2bdc34a66c..6392da00e5 100755 --- 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