From 413212ab24f0472e0ac57fa5278445fc917f285f Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Fri, 4 Aug 2023 20:10:48 +0200 Subject: [PATCH] artifacts: obtain: back to using flat `output/debs` structure, include revisioned and hashed in filename, but no subdirectories - handle the `global` artifact_deb_repo case specially (they go in the root, not subdir) --- lib/functions/artifacts/artifacts-obtain.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/functions/artifacts/artifacts-obtain.sh b/lib/functions/artifacts/artifacts-obtain.sh index 35da61a783..0463a33364 100644 --- a/lib/functions/artifacts/artifacts-obtain.sh +++ b/lib/functions/artifacts/artifacts-obtain.sh @@ -137,10 +137,14 @@ function obtain_complete_artifact() { declare single_deb_hashed_rel_path for one_artifact_deb_id in "${!artifact_map_packages[@]}"; do one_artifact_deb_package="${artifact_map_packages["${one_artifact_deb_id}"]}" - # @TODO: might be "${artifact_name}/${artifact_version}/" in the middle can be beneficial for cleaning, later? + single_deb_hashed_rel_path="${artifact_deb_repo}/${one_artifact_deb_package}_${artifact_version}_${artifact_deb_arch}.deb" artifact_map_debs+=(["${one_artifact_deb_id}"]="${single_deb_hashed_rel_path}") - artifact_map_debs_reversioned+=(["${one_artifact_deb_id}"]="${REVISION}/${artifact_deb_repo}/${artifact_name}/${artifact_version}/${one_artifact_deb_package}_${artifact_final_version_reversioned}_${artifact_deb_arch}.deb") + + declare artifact_deb_repo_prefix="" + [[ "${artifact_deb_repo}" != "global" ]] && artifact_deb_repo_prefix="${artifact_deb_repo}/" + + artifact_map_debs_reversioned+=(["${one_artifact_deb_id}"]="${artifact_deb_repo_prefix}${one_artifact_deb_package}_${artifact_final_version_reversioned}_${artifact_deb_arch}__${artifact_version}.deb") debs_counter+=1 done