From 1b7d1bb3c46ee0726139cbc7f2193e75b07e863f Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 12 Jun 2024 13:58:47 +0200 Subject: [PATCH] also fix check for unpacked source tarball in create_source_tarball.sh --- scripts/create_source_tarball.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/scripts/create_source_tarball.sh b/scripts/create_source_tarball.sh index 39e4c74f..885a6547 100755 --- a/scripts/create_source_tarball.sh +++ b/scripts/create_source_tarball.sh @@ -209,12 +209,17 @@ fi # sanity checks on source tarball cd $tmpdir; tar xfz $cwd/$sdist_tar_gz; cd - > /dev/null -unpacked_sdist=$tmpdir/${repo_underscore}-${version} -echo -n ">> checking for unpacked source tarball at $unpacked_sdist ... " -if [ -d $unpacked_sdist ]; then - ok -else - error "Expected unpacked source tarball at $unpacked_sdist, not found!" +for unpacked_sdist in $tmpdir/${repo_underscore}-${version} $tmpdir/${repo}-${version}; do + echo -n ">> checking for unpacked source tarball at $unpacked_sdist ... " + if [ -d $unpacked_sdist ]; then + ok + break + else + warning "Unpacked source tarball at $unpacked_sdist not found!" + fi +done +if [ ! -d $unpacked_sdist ]; then + error "No unpacked source tarball found for ${repo} ${version} in $tmpdir!" fi if [[ "$repo" == "easybuild-easyconfigs" ]]; then