Merge branch 'master' into justins_branch

diff --combined _webi/template.sh
index 244bd86c8e4887557899ebd48fb530dc98bc2743,c595d90991c48cc80f80cae0aa47210dbf477774..fc7629a27fec5bf2b4543f1614bd94d46e504975
--- 1/_webi/template.sh
--- 2/_webi/template.sh
+++ b/_webi/template.sh
@@@ -147,9 -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
@@@ -167,10 -166,9 +167,10 @@@
          # 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
@@@ -297,8 -295,8 +297,8 @@@ if [ -n "$(command -v pkg_get_current_v
          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}"