From d973f819a4c1010b1d1a2367898b51ba2ed3f4ee Mon Sep 17 00:00:00 2001 From: Jenkijo <32048650+jenkijo@users.noreply.github.com> Date: Sun, 3 Oct 2021 09:25:45 +0700 Subject: [PATCH 1/3] Remove go-platform dependency --- package.json | 1 - src/download.js | 2 +- src/go-platform.js | 31 +++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 src/go-platform.js diff --git a/package.json b/package.json index 26d7e52..04ad7c9 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,6 @@ }, "dependencies": { "cachedir": "^2.3.0", - "go-platform": "^1.0.0", "got": "^11.7.0", "gunzip-maybe": "^1.4.2", "hasha": "^5.2.2", diff --git a/src/download.js b/src/download.js index ffb50d1..9cbb596 100644 --- a/src/download.js +++ b/src/download.js @@ -14,7 +14,7 @@ go-ipfs install path: './go-ipfs' */ // @ts-ignore no types -const goenv = require('go-platform') +const goenv = require('./go-platform') const gunzip = require('gunzip-maybe') const got = require('got').default const path = require('path') diff --git a/src/go-platform.js b/src/go-platform.js new file mode 100644 index 0000000..14ff380 --- /dev/null +++ b/src/go-platform.js @@ -0,0 +1,31 @@ +const env = {} + +switch (process.platform) { + case "darwin": + case "linux": + case "freebsd": + env.GOOS = process.platform + break + case "sunos": + env.GOOS = "solaris" + break + case "win32": + env.GOOS = "windows" + break +} + +switch (process.arch) { + case "ia32": + env.GOARCH = "386" + break + case "x64": + env.GOARCH = "amd64" + break + case "arm": + env.GOARCH = "arm" + case "arm64": + env.GOARCH = "arm64" + break +} + +module.exports = env From 8e01f3ccab9aa4012c0c781badf2fda603f9f6e1 Mon Sep 17 00:00:00 2001 From: Alex Potsides Date: Wed, 19 Jan 2022 16:48:51 +0000 Subject: [PATCH 2/3] chore: update src/download.js --- src/download.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/download.js b/src/download.js index 9cbb596..eec24ca 100644 --- a/src/download.js +++ b/src/download.js @@ -13,7 +13,6 @@ go-ipfs architecture: the architecture of the hardware this program is run from go-ipfs install path: './go-ipfs' */ -// @ts-ignore no types const goenv = require('./go-platform') const gunzip = require('gunzip-maybe') const got = require('got').default From 1b3e882f3df9fa7db2836f2e67f007469b15af5d Mon Sep 17 00:00:00 2001 From: Alex Potsides Date: Wed, 19 Jan 2022 16:55:08 +0000 Subject: [PATCH 3/3] chore: fix types --- src/go-platform.js | 54 ++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/src/go-platform.js b/src/go-platform.js index 14ff380..a600766 100644 --- a/src/go-platform.js +++ b/src/go-platform.js @@ -1,31 +1,33 @@ -const env = {} +'use strict' -switch (process.platform) { - case "darwin": - case "linux": - case "freebsd": - env.GOOS = process.platform - break - case "sunos": - env.GOOS = "solaris" - break - case "win32": - env.GOOS = "windows" - break +function getGoOs () { + switch (process.platform) { + case "sunos": + return "solaris" + case "win32": + return "windows" + } + + return process.platform } -switch (process.arch) { - case "ia32": - env.GOARCH = "386" - break - case "x64": - env.GOARCH = "amd64" - break - case "arm": - env.GOARCH = "arm" - case "arm64": - env.GOARCH = "arm64" - break +function getGoArch () { + switch (process.arch) { + case "ia32": + return "386" + case "x64": + return "amd64" + case "arm": + return "arm" + case "arm64": + return "arm64" + } + + return process.arch } -module.exports = env + +module.exports = { + GOOS: getGoOs(), + GOARCH: getGoArch() +}