From 96d40556dddab0639c536c65a622c2c2e6fae8fa Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Wed, 7 Sep 2022 08:04:47 +0200
Subject: [PATCH] Simplification

---
 helpers/utils                       | 6 ++----
 helpers/vendor/docker-image-extract | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/helpers/utils b/helpers/utils
index 94c373a24..71e7d2b37 100644
--- a/helpers/utils
+++ b/helpers/utils
@@ -132,7 +132,7 @@ ynh_setup_source() {
     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
 
@@ -189,9 +189,7 @@ ynh_setup_source() {
     if ! "$src_extract"; then
         mv $src_filename $dest_dir
     elif [ "$src_format" = "docker" ]; then
-        /usr/share/yunohost/helpers.d/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"
+        /usr/share/yunohost/helpers.d/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
diff --git a/helpers/vendor/docker-image-extract b/helpers/vendor/docker-image-extract
index 55fbac92b..50a9751bd 100644
--- a/helpers/vendor/docker-image-extract
+++ b/helpers/vendor/docker-image-extract
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 #
 # This script pulls and extracts all files from an image in Docker Hub.
 #