Merge pull request #82 from erkin/current

remote: T5726: Replace the download procedure call
vyos · Nov 15, 2023 · 9c801c1 · 9c801c1
2 parents 28c670b + 58e5b6c
commit 9c801c1
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/scripts/vyatta-image-tools.pl b/scripts/vyatta-image-tools.pl
@@ -126,7 +126,9 @@ sub url_copy {
                 }
             }
         }
-        friendly_download($from, $to);
+        print "Downloading...\n";
+        download($from, $to);
+        print "Download complete.\n";
     }
     exit 0;
 }
@@ -213,12 +215,7 @@ sub upload {
 
 sub download {
     my ($from, $to) = @_;
-    system("python3 -c 'from vyos.remote import download; download(\"$to\", \"$from\")'");
-}
-
-sub friendly_download {
-    my ($from, $to) = @_;
-    system("python3 -c 'from vyos.remote import friendly_download; friendly_download(\"$to\", \"$from\")'");
+    system("python3 -c 'from vyos.remote import download; download(\"$to\", \"$from\", progressbar=True, check_space=True)'");
 }
 
 sub y_or_n {