failsafe optional var, template baserul for downloads

diff --git a/_common/normalize.js b/_common/normalize.js
index 8e984ffbf5eb18aa645d41f2158572c85fb49988..6a0830f15405774672f4016b0bb3ebf3dcf90076 100644 (file)
--- a/_common/normalize.js
+++ b/_common/normalize.js
@@ -67,6 +67,10 @@ function normalize(all) {
         rel.ext = exts[0];
       }
     }
+
+    if (all.download) {
+       rel.download = all.download.replace(/{{ download }}/, rel.download);
+    }
   });
   return all;
 }

diff --git a/golang/golang.bash b/golang/golang.bash
index a53c97ad28dd298d47d383bd424f1168ca3c2fc6..44f0176b93bec60b9fb4ae1424f869427cfc2607 100644 (file)
--- a/golang/golang.bash
+++ b/golang/golang.bash
@@ -50,7 +50,7 @@ WEBI_TMP=${WEBI_TMP:-"$(mktemp -d -t webinstall-go.XXXXXXXX)"}
 # The WEBI bootstrap will define these
 # but each script should be testable in its own right
 
-if [ -z "${WEBI_PKG_URL}" ]; then
+if [ -z "${WEBI_PKG_URL:-}" ]; then
   release_tab="${WEBI_HOST}/api/releases/go@${WEBI_VERSION:-}.csv?os=$(uname -s)&arch=$(uname -m)&ext=tar&limit=1"
   WEBI_CSV=$(curl -fsSL "$release_tab" -H "User-Agent: $(uname -a)")
   WEBI_CHANNEL=$(echo $WEBI_TAB | cut -d ',' -f 3)

diff --git a/rg/rg.bash b/rg/rg.bash
index 577e02902840b323d9489783ee3fcdac090fcf53..f7501bd5505bdead96fcf48f431eb968f3dd31d1 100644 (file)
--- a/rg/rg.bash
+++ b/rg/rg.bash
@@ -34,7 +34,7 @@ WEBI_TMP=${WEBI_TMP:-"$(mktemp -d -t webinstall-ripgrep.XXXXXXXX)"}
 # The WEBI bootstrap will define these
 # but each script should be testable in its own right
 
-if [ -z "${WEBI_PKG_URL}" ]; then
+if [ -z "${WEBI_PKG_URL:-}" ]; then
   release_tab="${WEBI_HOST}/api/releases/ripgrep@${WEBI_VERSION:-}.csv?os=$(uname -s)&arch=$(uname -m)&ext=tar&limit=1"
   WEBI_CSV=$(curl -fsSL "$release_tab" -H "User-Agent: $(uname -a)")
   WEBI_CHANNEL=$(echo $WEBI_TAB | cut -d ',' -f 3)