From da49c200fb7fab041f28d23e7cde209623715ef4 Mon Sep 17 00:00:00 2001 From: Jake Jarvis Date: Thu, 30 Jan 2020 20:33:17 -0500 Subject: [PATCH] further simplify install logic --- .gitignore | 6 +++--- lib/index.js | 32 +++++--------------------------- 2 files changed, 8 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 2c83906..0395fae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/node_modules/ -/vendor/ -/npm-debug.log +node_modules/ +vendor/ +npm-debug.log diff --git a/lib/index.js b/lib/index.js index 8e90d5e..06dddad 100644 --- a/lib/index.js +++ b/lib/index.js @@ -6,35 +6,11 @@ const { hugoVersion } = require('../package.json'); const baseUrl = `https://github.com/gohugoio/hugo/releases/download/v${hugoVersion}/`; -const binNameMap = { - darwin: { - ia32: 'hugo', - x64: 'hugo' - }, - freebsd: { - arm: 'hugo', - ia32: 'hugo', - x64: 'hugo' - }, - linux: { - arm: 'hugo', - ia32: 'hugo', - x64: 'hugo' - }, - win32: { - ia32: 'hugo.exe', - x64: 'hugo.exe' - } -}; - -const dest = path.join(__dirname, '../vendor'); -const binName = (binNameMap[process.platform] && binNameMap[process.platform][process.arch]) || ''; - +// Default to extended Hugo, fall back to vanilla Hugo on unsupported platforms const extendedBin = new BinWrapper() .src(`${baseUrl}hugo_extended_${hugoVersion}_Linux-64bit.tar.gz`, 'linux', 'x64') .src(`${baseUrl}hugo_extended_${hugoVersion}_macOS-64bit.tar.gz`, 'darwin', 'x64') .src(`${baseUrl}hugo_extended_${hugoVersion}_Windows-64bit.zip`, 'win32', 'x64') - // Falling back to normal version on non supported platforms .src(`${baseUrl}hugo_${hugoVersion}_FreeBSD-32bit.tar.gz`, 'freebsd', 'x86') .src(`${baseUrl}hugo_${hugoVersion}_FreeBSD-64bit.tar.gz`, 'freebsd', 'x64') .src(`${baseUrl}hugo_${hugoVersion}_FreeBSD-ARM.tar.gz`, 'freebsd', 'arm') @@ -42,8 +18,10 @@ const extendedBin = new BinWrapper() .src(`${baseUrl}hugo_${hugoVersion}_Linux-ARM.tar.gz`, 'linux', 'arm') .src(`${baseUrl}hugo_${hugoVersion}_macOS-32bit.tar.gz`, 'darwin', 'x86') .src(`${baseUrl}hugo_${hugoVersion}_Windows-32bit.zip`, 'win32', 'x86') - .dest(dest) - .use(binName); + .dest(path.join(__dirname, '../vendor')) + .use(process.platform === 'win32' ? 'hugo.exe' : 'hugo'); + +// TODO: download checksums.txt file and validate package integrity module.exports = function () { return extendedBin;