From: AJ ONeal <aj@therootcompany.com>
Date: Mon, 4 May 2020 17:50:52 +0000 (+0000)
Subject: fix caddy bin location, generically remove leading 'v'
X-Git-Url: https://git.josue.xyz/?p=webi-installers%2F.git;a=commitdiff_plain;h=ce24512596367001e74ff3931ecbdedcbdb6bb55

fix caddy bin location, generically remove leading 'v'
---

diff --git a/_common/normalize.js b/_common/normalize.js
index f210aa3..302952f 100644
--- 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 652a05b..8540687 100644
--- 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
 
 ###################