From 2828e05644f987ac544fa7ef45bc30154b9d773c Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Mon, 6 May 2024 23:45:20 +0200 Subject: [PATCH] need to create full directory tree in lower dir --- EESSI-determine-rebuilds.sh | 3 ++- bot/build.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/EESSI-determine-rebuilds.sh b/EESSI-determine-rebuilds.sh index ec9a141978..fac217e7e4 100755 --- a/EESSI-determine-rebuilds.sh +++ b/EESSI-determine-rebuilds.sh @@ -112,7 +112,8 @@ else app_dir=${EASYBUILD_INSTALLPATH}/software/${app} app_module=${EASYBUILD_INSTALLPATH}/modules/all/${app}.lua echo_yellow "Removing ${app_dir} and ${app_module}..." - echo "REMOVE_SOFTWARE ${app_dir}" + # echo "REMOVE_SOFTWARE ${app_dir}" + find ${app_dir} -type d | sed -e 's/^/REMOVE_DIRECTORY /' echo "REMOVE_MODULE ${app_module}" done else diff --git a/bot/build.sh b/bot/build.sh index c537d725b9..aa5d7f8ad3 100755 --- a/bot/build.sh +++ b/bot/build.sh @@ -207,13 +207,13 @@ else -- ./EESSI-determine-rebuilds.sh "${DETERMINE_SCRIPT_ARGS[@]}" "$@" 2>&1 | tee -a ${determine_outerr} # process output file - # for each line containing 'REMOVE_SOFTWARE some_path' + # for each line containing 'REMOVE_DIRECTORY some_path' # create a new directory ${STORAGE}/lower_dirs/some_path_stripped # where the prefix /cvmfs/repo_name is removed from some_path # set permission of the directory to u+rwx # add directory to LOWER_DIRS (':' separated list of directories) LOWER_DIRS= - for remove_dir in $(grep REMOVE_SOFTWARE ${determine_outerr} | cut -f4- -d'/'); do + for remove_dir in $(grep REMOVE_DIRECTORY ${determine_outerr} | cut -f4- -d'/'); do mkdir -p ${STORAGE}/lower_dirs/${remove_dir} chmod u+rwx ${STORAGE}/lower_dirs/${remove_dir} if [[ -z ${LOWER_DIRS} ]]; then