From f632174adb8d64f84462a840fb08ced9c4e48704 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 7 Sep 2022 08:02:01 +0200 Subject: [PATCH] simplification --- scripts/ynh_docker_image_extract | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/ynh_docker_image_extract b/scripts/ynh_docker_image_extract index 94f9625..9a753ca 100644 --- a/scripts/ynh_docker_image_extract +++ b/scripts/ynh_docker_image_extract @@ -71,7 +71,7 @@ ynh_setup_source_docker() { src_format=${src_format:-tar.gz} src_format=$(echo "$src_format" | tr '[:upper:]' '[:lower:]') src_extract=${src_extract:-true} - if [ "$src_filename" = "" ]; then + if [[ "$src_filename" = "" && "$src_format" != "docker" ]]; then src_filename="${source_id}.${src_format}" fi @@ -128,9 +128,7 @@ ynh_setup_source_docker() { if ! "$src_extract"; then mv $src_filename $dest_dir elif [ "$src_format" = "docker" ]; then - $YNH_APP_BASEDIR/scripts/vendor/docker-image-extract -p $src_plateform -o $src_filename $src_url 2>&1 - mv $src_filename $dest_dir - ynh_secure_remove --file="$src_filename" + $YNH_APP_BASEDIR/scripts/vendor/docker-image-extract -p $src_plateform -o $dest_dir $src_url 2>&1 elif [ "$src_format" = "zip" ]; then # Zip format # Using of a temp directory, because unzip doesn't manage --strip-components