From 95eff44af5ad7c61a46b0273934c9e7255e8789b Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Wed, 9 Mar 2016 08:55:19 -0400 Subject: [PATCH] Move package.ignore contents to package.json This allows `Makefile` to require and join the ignore entries easily with NodeJS instead of relying on `tr` and `sed`. --- Makefile | 2 +- package.ignore | 21 --------------------- package.json | 22 ++++++++++++++++++++++ 3 files changed, 23 insertions(+), 22 deletions(-) delete mode 100644 package.ignore diff --git a/Makefile b/Makefile index f839b687..7893e4b3 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ELECTRON_PACKAGER=./node_modules/.bin/electron-packager ELECTRON_BUILDER=./node_modules/.bin/electron-builder -ELECTRON_IGNORE=$(shell cat package.ignore | tr "\\n" "|" | sed "s/.$$//") +ELECTRON_IGNORE=$(shell node -e "console.log(require('./package.json').packageIgnore.join('|'))") ELECTRON_VERSION=0.36.8 ETCHER_VERSION=$(shell node -e "console.log(require('./package.json').version)") APPLICATION_NAME=$(shell node -e "console.log(require('./package.json').displayName)") diff --git a/package.ignore b/package.ignore deleted file mode 100644 index ce775dac..00000000 --- a/package.ignore +++ /dev/null @@ -1,21 +0,0 @@ -LICENSE -Makefile -package.ignore -(.*)\.md -appveyor.yml -bower.json -gulpfile.js -screenshot.png -tests -etcher-release -lib/scss -node_modules/electron-mocha -node_modules/electron-builder -node_modules/angular-mocks -node_modules/browserify -node_modules/gulp* -node_modules/jshint-stylish -node_modules/mochainon -node_modules/vinyl-* -node_modules/rindle -node_modules/tmp diff --git a/package.json b/package.json index ddaf7a74..5b5f4474 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,28 @@ }, "author": "Juan Cruz Viotti ", "license": "Apache-2.0", + "packageIgnore": [ + "LICENSE", + "Makefile", + "(.*)\\.md", + "appveyor.yml", + "bower.json", + "gulpfile.js", + "screenshot.png", + "tests", + "etcher-release", + "lib/scss", + "node_modules/electron-mocha", + "node_modules/electron-builder", + "node_modules/angular-mocks", + "node_modules/browserify", + "node_modules/gulp*", + "node_modules/jshint-stylish", + "node_modules/mochainon", + "node_modules/vinyl-*", + "node_modules/rindle", + "node_modules/tmp" + ], "builder": { "osx": { "title": "Etcher",