Add expected min libvips version to error messages

This commit is contained in:
Lovell Fuller 2017-12-07 23:16:33 +00:00
parent 053e727bd5
commit 47237b1f15

View File

@ -56,15 +56,15 @@ module.exports.download_vips = function () {
// Ensure Intel 64-bit or ARM // Ensure Intel 64-bit or ARM
const arch = process.env.npm_config_arch || process.arch; const arch = process.env.npm_config_arch || process.arch;
if (arch === 'ia32') { if (arch === 'ia32') {
error('Intel Architecture 32-bit systems require manual installation of libvips - please see http://sharp.dimens.io/page/install'); error(`Intel Architecture 32-bit systems require manual installation of libvips >= ${minimumLibvipsVersion} - please see http://sharp.dimens.io/page/install`);
} }
// Ensure glibc Linux // Ensure glibc Linux
if (detectLibc.isNonGlibcLinux) { if (detectLibc.isNonGlibcLinux) {
error(`Use with ${detectLibc.family} libc requires manual installation of libvips - please see http://sharp.dimens.io/page/install`); error(`Use with ${detectLibc.family} libc requires manual installation of libvips >= ${minimumLibvipsVersion} - please see http://sharp.dimens.io/page/install`);
} }
// Ensure glibc >= 2.13 // Ensure glibc >= 2.13
if (detectLibc.family === detectLibc.GLIBC && detectLibc.version && semver.lt(`${detectLibc.version}.0`, '2.13.0')) { if (detectLibc.family === detectLibc.GLIBC && detectLibc.version && semver.lt(`${detectLibc.version}.0`, '2.13.0')) {
error(`Use with glibc version ${detectLibc.version} requires manual installation of libvips - please see http://sharp.dimens.io/page/install`); error(`Use with glibc version ${detectLibc.version} requires manual installation of libvips >= ${minimumLibvipsVersion} - please see http://sharp.dimens.io/page/install`);
} }
// Arch/platform-specific .tar.gz // Arch/platform-specific .tar.gz
const tarFilename = ['libvips', minimumLibvipsVersion, currentPlatformId].join('-') + '.tar.gz'; const tarFilename = ['libvips', minimumLibvipsVersion, currentPlatformId].join('-') + '.tar.gz';