Merge branch 'master' into justins_branch

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

diff --git a/_webi/template.sh b/_webi/template.sh
index 244bd86c8e4887557899ebd48fb530dc98bc2743..fc7629a27fec5bf2b4543f1614bd94d46e504975 100644 (file)
--- a/_webi/template.sh
+++ b/_webi/template.sh
@@ -167,9 +167,9 @@ 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"
 }
 
@@ -297,8 +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/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_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}"