fix caddy bin location, generically remove leading 'v'

diff --git a/_common/normalize.js b/_common/normalize.js
index f210aa31df641cf5c998c62fc5f5537c45095cb9..302952f8f28723a99473617cc57dda5b2565efa4 100644 (file)
--- a/_common/normalize.js
+++ b/_common/normalize.js
@@ -35,6 +35,7 @@ var archMap = {
 
 function normalize(all) {
   all.releases.forEach(function (rel) {
+    rel.version = rel.version.replace(/^v/i, '');
     if (!rel.name) {
       rel.name = rel.download.replace(/.*\//, '');
     }

diff --git a/caddy/caddy.bash b/caddy/caddy.bash
index 652a05b29fbe86c894c2b2b05fac778ce1702aed..85406878f6537addfd4e60fe8701812d077a4da1 100644 (file)
--- a/caddy/caddy.bash
+++ b/caddy/caddy.bash
@@ -43,7 +43,7 @@ webi_extract
 
 pushd "$WEBI_TMP" 2>&1 >/dev/null
         echo Installing caddy v${WEBI_VERSION} as "$new_caddy"
-        mv ./caddy-*/caddy "$HOME/.local/bin/"
+        mv ./caddy "$HOME/.local/bin/"
 popd 2>&1 >/dev/null
 
 ###################