File tree Expand file tree Collapse file tree 1 file changed +9
-2
lines changed
Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -265,16 +265,23 @@ BUILD_TMPDIR=$(grep ' as tmp directory ' ${build_outerr} | cut -d ' ' -f 2)
265265TARBALL_STEP_ARGS+=(" --resume" " ${BUILD_TMPDIR} " )
266266
267267timestamp=$( date +%s)
268+ if [[ -x " $( command -v zstd) " ]]; then
269+ tarball_extension=" tar.zst"
270+ elif [[ -x " $( command -v gzip) " ]]; then
271+ tarball_extension=" tar.gz"
272+ else
273+ tarball_extension=" tar"
274+ fi
268275# to set EESSI_VERSION we need to source init/eessi_defaults now
269276source $software_layer_dir /init/eessi_defaults
270277# Note: if ${EESSI_DEV_PROJECT} is defined (building for dev.eessi.io), then we
271278# append the project (subdirectory) name to the end tarball name. This is information
272279# then used at the ingestion stage. If ${EESSI_DEV_PROJECT} is not defined, nothing is
273280# appended
274281if [[ -z ${EESSI_ACCELERATOR_TARGET_OVERRIDE} ]]; then
275- export TARBALL=$( printf " eessi-%s-software-%s-%s-%b%d.tar.zst " ${EESSI_VERSION} ${EESSI_OS_TYPE} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE// \/ / -} ${EESSI_DEV_PROJECT: +$EESSI_DEV_PROJECT -} ${timestamp} )
282+ export TARBALL=$( printf " eessi-%s-software-%s-%s-%b%d.${tarball_extension} " ${EESSI_VERSION} ${EESSI_OS_TYPE} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE// \/ / -} ${EESSI_DEV_PROJECT: +$EESSI_DEV_PROJECT -} ${timestamp} )
276283else
277- export TARBALL=$( printf " eessi-%s-software-%s-%s-%s-%b%d.tar.zst " ${EESSI_VERSION} ${EESSI_OS_TYPE} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE// \/ / -} ${EESSI_ACCELERATOR_TARGET_OVERRIDE// \/ / -} ${EESSI_DEV_PROJECT: +$EESSI_DEV_PROJECT -} ${timestamp} )
284+ export TARBALL=$( printf " eessi-%s-software-%s-%s-%s-%b%d.${tarball_extension} " ${EESSI_VERSION} ${EESSI_OS_TYPE} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE// \/ / -} ${EESSI_ACCELERATOR_TARGET_OVERRIDE// \/ / -} ${EESSI_DEV_PROJECT: +$EESSI_DEV_PROJECT -} ${timestamp} )
278285fi
279286
280287# Export EESSI_DEV_PROJECT to use it (if needed) when making tarball
You can’t perform that action at this time.
0 commit comments