Most Linux systems no longer require the preinstall script

This commit is contained in:
Lovell Fuller 2016-02-09 20:18:00 +00:00
parent afb30b3695
commit a9eb65c462
2 changed files with 16 additions and 4 deletions

View File

@ -47,7 +47,7 @@
"vips" "vips"
], ],
"dependencies": { "dependencies": {
"bluebird": "^3.1.5", "bluebird": "^3.2.2",
"color": "^0.11.1", "color": "^0.11.1",
"nan": "^2.2.0", "nan": "^2.2.0",
"semver": "^5.1.0", "semver": "^5.1.0",
@ -61,7 +61,7 @@
"icc": "^0.0.2", "icc": "^0.0.2",
"istanbul": "^0.4.2", "istanbul": "^0.4.2",
"mocha": "^2.4.5", "mocha": "^2.4.5",
"mocha-jshint": "^2.3.0", "mocha-jshint": "^2.3.1",
"node-cpplint": "^0.4.0", "node-cpplint": "^0.4.0",
"rimraf": "^2.5.1", "rimraf": "^2.5.1",
"bufferutil": "^1.2.1" "bufferutil": "^1.2.1"

View File

@ -1,7 +1,14 @@
#!/bin/sh #!/bin/sh
# Ensures libvips is installed and attempts to install it if not # This script is no longer required on most
# Currently supports: # 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 Linux
# * Debian 7, 8 # * Debian 7, 8
# * Ubuntu 12.04, 14.04, 14.10, 15.04, 15.10 # * Ubuntu 12.04, 14.04, 14.10, 15.04, 15.10
@ -119,6 +126,11 @@ if [ "$(id -u)" -ne "0" ]; then
exit 1 exit 1
fi 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 # OS-specific installations of libopenslide follows
# Either openslide does not exist, or vips is installed without openslide support # 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 if [ $enable_openslide -eq 1 ] && [ -z $vips_with_openslide ] && [ $openslide_exists -eq 0 ]; then