From 525d41e63cfdb867196ada49708b7115e79e258a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Fri, 29 Nov 2019 13:41:18 +0100 Subject: [PATCH] Merge pre-install scripts --- package.json | 2 +- scripts/check-node-canvas.sh | 24 ------------------------ scripts/install.sh | 7 ------- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100755 scripts/check-node-canvas.sh delete mode 100644 scripts/install.sh diff --git a/package.json b/package.json index 9daa48bd..696d26c7 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "scripts": { "lint:fix": "eslint --fix app.js \"lib/**/*.js\" \"test/**/*.js\"", "lint": "eslint app.js \"lib/**/*.js\" \"test/**/*.js\"", - "preinstall": "./scripts/check-node-canvas.sh", + "preinstall": "./scripts/darwin-pre-install.sh", "pretest:setup": "npm run lint", "test:setup": "NODE_ENV=test node test setup", "pretest": "npm run test:setup", diff --git a/scripts/check-node-canvas.sh b/scripts/check-node-canvas.sh deleted file mode 100755 index a698e412..00000000 --- a/scripts/check-node-canvas.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -if [[ "$OSTYPE" == "darwin"* ]]; then - CAIRO_PKG_CONFIG=`pkg-config cairo --cflags-only-I 2> /dev/null` - RESULT=$? - - if [[ ${RESULT} -ne 0 ]]; then - echo "###################################################################################" - echo "# PREINSTALL HOOK ERROR #" - echo "#---------------------------------------------------------------------------------#" - echo "# #" - echo "# node-canvas install error: some packages required by 'cairo' are not found #" - echo "# #" - echo -e "# Use '\033[1mmake all\033[0m', it will take care of common/known issues #" - echo "# #" - echo "# As an alternative try: #" - echo "# Try to 'export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig' #" - echo "# #" - echo "# If problems persist visit: https://github.com/Automattic/node-canvas/wiki #" - echo "# #" - echo "###################################################################################" - exit 1 - fi -fi diff --git a/scripts/install.sh b/scripts/install.sh deleted file mode 100644 index f596aa12..00000000 --- a/scripts/install.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [[ "$OSTYPE" == "darwin"* ]]; then - export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig -fi - -npm install