From a9eb65c462ec6e83cecb74f85760c715f5f0cd64 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Tue, 9 Feb 2016 20:18:00 +0000 Subject: [PATCH] Most Linux systems no longer require the preinstall script --- package.json | 4 ++-- preinstall.sh | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 73307645..7e27e135 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "vips" ], "dependencies": { - "bluebird": "^3.1.5", + "bluebird": "^3.2.2", "color": "^0.11.1", "nan": "^2.2.0", "semver": "^5.1.0", @@ -61,7 +61,7 @@ "icc": "^0.0.2", "istanbul": "^0.4.2", "mocha": "^2.4.5", - "mocha-jshint": "^2.3.0", + "mocha-jshint": "^2.3.1", "node-cpplint": "^0.4.0", "rimraf": "^2.5.1", "bufferutil": "^1.2.1" diff --git a/preinstall.sh b/preinstall.sh index 5032fa24..8cda9453 100755 --- a/preinstall.sh +++ b/preinstall.sh @@ -1,7 +1,14 @@ #!/bin/sh -# Ensures libvips is installed and attempts to install it if not -# Currently supports: +# This script is no longer required on most +# 64-bit Linux systems when using sharp v0.12.0+ + +# See http://sharp.dimens.io/page/install#linux + +# If you really need this script, it will attempt to +# globally install libvips if not already available. + +# Supports: # * Debian Linux # * Debian 7, 8 # * Ubuntu 12.04, 14.04, 14.10, 15.04, 15.10 @@ -119,6 +126,11 @@ if [ "$(id -u)" -ne "0" ]; then exit 1 fi +# Deprecation warning +if [ "$(arch)" == "x86_64" ]; then + echo "This script is no longer required on most 64-bit Linux systems when using sharp v0.12.0+" +fi + # OS-specific installations of libopenslide follows # Either openslide does not exist, or vips is installed without openslide support if [ $enable_openslide -eq 1 ] && [ -z $vips_with_openslide ] && [ $openslide_exists -eq 0 ]; then