Merge branch 'master' into justins_branch

diff --git a/_webi/template.sh b/_webi/template.sh
index c595d90991c48cc80f80cae0aa47210dbf477774..fc7629a27fec5bf2b4543f1614bd94d46e504975 100644 (file)
--- a/_webi/template.sh
+++ b/_webi/template.sh
@@ -147,8 +147,9 @@ webi_download() {
         return 0
     fi
 
-    echo "Downloading $PKG_NAME from:" #Show the package and the source URL  
-    echo "$WEBI_PKG_URL"
+    echo "Downloading $PKG_NAME from"
+    echo "$my_url"
+
     # It's only 2020, we can't expect to have reliable CLI tools
     # to tell us the size of a file as part of a base system...
     if [ -n "$WEBI_WGET" ]; then
@@ -166,9 +167,10 @@ webi_download() {
         # TODO curl -fsSL --remote-name --remote-header-name --write-out "$my_url"
         curl -fSL -H "User-Agent: curl $WEBI_UA" "$my_url" -o "$my_dl.part"
     fi
-    echo ""
-    echo "Saved as $my_dl" #Show the path of the package
     mv "$my_dl.part" "$my_dl"
+
+    echo ""
+    echo "Saved as $my_dl"
 }
 
 # detect which archives can be used