fix bug in call extra install script

trz42 · Jun 5, 2024 · 532e774 · 532e774
1 parent 8514bd4
commit 532e774
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/EESSI-install-software.sh b/EESSI-install-software.sh
@@ -258,9 +258,9 @@ fi
 
 # Install extra software that is needed (e.g., for providing a custom ctypes
 # library when needed)
-cd scripts/extra
-${EESSI_PREFIX}/scripts/extra/install_extra_packages.sh --temp-dir /tmp/temp --easystack eessi-2023.06-extra-packages.yml
-cd -
+cd ${TOPDIR}/scripts/extra
+./install_extra_packages.sh --temp-dir /tmp/temp --easystack eessi-2023.06-extra-packages.yml
+cd ${TOPDIR}
 
 # use PR patch file to determine in which easystack files stuff was added
 changed_easystacks=$(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^easystacks/.*yml$' | egrep -v 'known-issues|missing') 

diff --git a/install_scripts.sh b/install_scripts.sh
@@ -116,12 +116,6 @@ nvidia_files=(
 )
 copy_files_by_list ${TOPDIR}/scripts/gpu_support/nvidia ${INSTALL_PREFIX}/scripts/gpu_support/nvidia "${nvidia_files[@]}"
 
-# Copy files for the scripts/extra directory
-extra_files=(
-    install_custom_ctypes.sh
-)
-copy_files_by_list ${TOPDIR}/scripts/extra ${INSTALL_PREFIX}/scripts/extra "${extra_files[@]}"
-
 # Copy over EasyBuild hooks file used for installations
 hook_files=(
     eb_hooks.py