Merge branch 'master' into justins_branch

diff --git a/.gitignore b/.gitignore
index 78216019d7e5c1a649a7668df9ddfe07545c194e..a1144c9c2c891e39a08efea95799daa8fba3ea5a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.env
 node_modules
 install-*.sh
 install-*.bat

diff --git a/_common/github.js b/_common/github.js
index 442b16b0b82534fc7aea8399e3718d388f8641c5..aa98074ccfc9ed2fc8af7d5e6c13e4f75badded7 100644 (file)
--- a/_common/github.js
+++ b/_common/github.js
@@ -1,5 +1,7 @@
 'use strict';
 
+require('dotenv').config();
+
 /**
  * Gets the releases for 'ripgrep'. This function could be trimmed down and made
  * for use with any github release.
@@ -21,10 +23,20 @@ function getAllReleases(
   if (!repo) {
     return Promise.reject('missing repo name');
   }
-  return request({
+
+  var req = {
     url: `${baseurl}/repos/${owner}/${repo}/releases`,
     json: true
-  }).then((resp) => {
+  };
+  // TODO I really don't like global config, find a way to do better
+  if (process.env.GITHUB_USERNAME) {
+    req.auth = {
+      user: process.env.GITHUB_USERNAME,
+      pass: process.env.GITHUB_TOKEN
+    };
+  }
+
+  return request(req).then((resp) => {
     const gHubResp = resp.body;
     const all = {
       releases: [],

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}"

diff --git a/package-lock.json b/package-lock.json
index 69f044af073f3c20588248cc1f3a8188cac8d79e..304b4e4568c31586723d186c3b7d2d0803e00cf1 100644 (file)
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,11 @@
       "resolved": "https://registry.npmjs.org/@root/request/-/request-1.6.1.tgz",
       "integrity": "sha512-8wrWyeBLRp7T8J36GkT3RODJ6zYmL0/maWlAUD5LOXT28D3TDquUepyYDKYANNA3Gc8R5ZCgf+AXvSTYpJEWwQ=="
     },
+    "dotenv": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="
+    },
     "marked": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.0.tgz",

diff --git a/package.json b/package.json
index 105bbe416efbfdb273b1dae20f4253213f8b9744..a6961af6892e747123ac9e2d155ea6bb44366f63 100644 (file)
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
   "homepage": "https://github.com/webinstall/packages#readme",
   "dependencies": {
     "@root/request": "^1.6.1",
+    "dotenv": "^8.2.0",
     "shmatter": "^1.0.1"
   }
 }