add comrak for Markdown to HTML

[webi-installers/.git] / _webi / template.sh

diff --git a/_webi/template.sh b/_webi/template.sh
index 4ace5144d578450f546d37e75f83a33c2032f3ce..651ae99fe967ace54a3d1773e2ea7eec237f051e 100644 (file)
--- a/_webi/template.sh
+++ b/_webi/template.sh
@@ -147,8 +147,9 @@ webi_download() {
         return 0
     fi
 
-    echo "Downloading $PKG_NAME from:"
-    echo -e "\e]8;;$WEBI_PKG_URL\a$WEBI_PKG_URL\e]8;;\a"
+    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
+    mv "$my_dl.part" "$my_dl"
+
     echo ""
     echo "Saved as $my_dl"
-    mv "$my_dl.part" "$my_dl"
 }
 
 # detect which archives can be used
@@ -317,10 +319,10 @@ if [ -n "$(command -v pkg_get_current_version)" ]; then
 
     webi_link
 
+    _webi_enable_exec
     pushd "$WEBI_TMP" 2>&1 >/dev/null
         [ -n "$(command -v pkg_post_install)" ] && pkg_post_install || webi_post_install
     popd 2>&1 >/dev/null
-    _webi_enable_exec
 
     pushd "$WEBI_TMP" 2>&1 >/dev/null
         [ -n "$(command -v pkg_done_message)" ] && pkg_done_message || _webi_done_message