better test output

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

diff --git a/_webi/template.sh b/_webi/template.sh
index fca9c699a34b3efa0f82a4a0399a0c2ace101cd7..651ae99fe967ace54a3d1773e2ea7eec237f051e 100644 (file)
--- a/_webi/template.sh
+++ b/_webi/template.sh
@@ -147,7 +147,8 @@ webi_download() {
         return 0
     fi
 
-    echo "Downloading $PKG_NAME to $my_dl"
+    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...
@@ -166,8 +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"
 }
 
 # detect which archives can be used
@@ -294,7 +297,8 @@ if [ -n "$(command -v pkg_get_current_version)" ]; then
         pkg_dst_cmd="${pkg_dst_cmd:-$HOME/.local/bin/$pkg_cmd_name}"
         pkg_dst="$pkg_dst_cmd" # "$(dirname "$(dirname $pkg_dst_cmd)")"
 
-        pkg_src_cmd="${pkg_src_cmd:-$HOME/.local/xbin/$pkg_cmd_name-v$WEBI_VERSION}"
+        #pkg_src_cmd="${pkg_src_cmd:-$HOME/.local/opt/$pkg_cmd_name-v$WEBI_VERSION/bin/$pkg_cmd_name-v$WEBI_VERSION}"
+        pkg_src_cmd="${pkg_src_cmd:-$HOME/.local/opt/$pkg_cmd_name-v$WEBI_VERSION/bin/$pkg_cmd_name}"
         pkg_src="$pkg_src_cmd" # "$(dirname "$(dirname $pkg_src_cmd)")"
     else
         pkg_dst="${pkg_dst:-$HOME/.local/opt/$pkg_cmd_name}"
@@ -315,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