From 8e3bbe14faed5cbdf5d7c3ea1cab825c79b9fd6b Mon Sep 17 00:00:00 2001 From: Grayson Earle Date: Sun, 17 May 2020 13:47:31 -0700 Subject: [PATCH] new vers, hopefully fixed windows, also added a second to download redirect --- desktop/miner.js | 3 +- desktop/package-lock.json | 109 ++++++++++++++++++++++++++++++++++++-- desktop/package.json | 3 +- docs/js/main.js | 4 +- 4 files changed, 112 insertions(+), 7 deletions(-) diff --git a/desktop/miner.js b/desktop/miner.js index 2d4fecc..21810b8 100644 --- a/desktop/miner.js +++ b/desktop/miner.js @@ -74,6 +74,7 @@ class Miner { } start() { + const fixPath = require('fix-path')(); this.proc = spawn(this.binary, this.makeArgs()); this.proc.stdout.on('data', data => { @@ -105,4 +106,4 @@ class Miner { } } -module.exports = Miner; \ No newline at end of file +module.exports = Miner; diff --git a/desktop/package-lock.json b/desktop/package-lock.json index 1165491..cd2b6ce 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -1,6 +1,6 @@ { "name": "bailbloc", - "version": "1.3.6", + "version": "1.3.7", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -767,6 +767,11 @@ "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", "dev": true }, + "default-shell": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/default-shell/-/default-shell-1.0.1.tgz", + "integrity": "sha1-dSMEvdxhdPSespy5iP7qC4gTyLw=" + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -1299,6 +1304,14 @@ } } }, + "fix-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/fix-path/-/fix-path-3.0.0.tgz", + "integrity": "sha512-opGAl4+ip5jUikHR2C8Jo7czZ80pz8EK/0gMlAZu7xgDmBqIynlX8SMYg9KowYjAU6HT0nxsSJEWru0u+n+N2Q==", + "requires": { + "shell-path": "^2.1.0" + } + }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -2292,8 +2305,7 @@ "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", - "dev": true + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" }, "p-limit": { "version": "1.1.0", @@ -2778,6 +2790,97 @@ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", "dev": true }, + "shell-env": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/shell-env/-/shell-env-0.3.0.tgz", + "integrity": "sha1-IlAzkCKYkWW9pOt784Ov6qqS3DQ=", + "requires": { + "default-shell": "^1.0.0", + "execa": "^0.5.0", + "strip-ansi": "^3.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "cross-spawn": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", + "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", + "requires": { + "lru-cache": "^4.0.1", + "which": "^1.2.9" + } + }, + "execa": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.5.1.tgz", + "integrity": "sha1-3j+4XLjW6RyFvLzrFkWBeFy1ezY=", + "requires": { + "cross-spawn": "^4.0.0", + "get-stream": "^2.2.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "get-stream": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", + "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", + "requires": { + "object-assign": "^4.0.1", + "pinkie-promise": "^2.0.0" + } + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "requires": { + "path-key": "^2.0.0" + } + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "requires": { + "pinkie": "^2.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + } + } + }, + "shell-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/shell-path/-/shell-path-2.1.0.tgz", + "integrity": "sha1-6n0GrhBwh0obrFxlu5vdYuT2ejg=", + "requires": { + "shell-env": "^0.3.0" + } + }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", diff --git a/desktop/package.json b/desktop/package.json index a21f093..b47ec82 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -1,6 +1,6 @@ { "name": "bailbloc", - "version": "1.3.6", + "version": "1.3.7", "description": "converts computational cycles in bail funds", "main": "main.js", "scripts": { @@ -29,6 +29,7 @@ "electron-positioner": "^3.0.0", "electron-settings": "^3.1.1", "electron-updater": "^2.16.1", + "fix-path": "^3.0.0", "is-charging": "^1.2.0", "net": "^1.0.2", "strip-ansi": "^4.0.0", diff --git a/docs/js/main.js b/docs/js/main.js index 3c517da..8b91819 100644 --- a/docs/js/main.js +++ b/docs/js/main.js @@ -34,7 +34,7 @@ getRelease(); // take to download page after clicking link $('#download-button').click(function() { - setTimeout(gotoDownloadPage, 1000); + setTimeout(gotoDownloadPage, 2000); }); @@ -103,4 +103,4 @@ function popUp(url, _width, _height) { newwindow = window.open(url, 'Join the Bloc!', 'height=' + _height + ',width=' + _width); if (window.focus) { newwindow.focus() } return false; -} \ No newline at end of file +}