From e897bf1545558f168c8bb33219b7a4d28671b625 Mon Sep 17 00:00:00 2001 From: timwis Date: Mon, 18 Jul 2016 13:09:07 -0400 Subject: [PATCH] build and test scripts use binaries on path --- scripts/build | 10 ++-------- scripts/test | 32 +++++++++++--------------------- 2 files changed, 13 insertions(+), 29 deletions(-) diff --git a/scripts/build b/scripts/build index 8853679..57fb9c1 100755 --- a/scripts/build +++ b/scripts/build @@ -1,10 +1,5 @@ #!/bin/sh -dirname=$(dirname "$(readlink -f "$0")") - -browserify="$dirname/../node_modules/.bin/browserify" -uglify="$dirname/../node_modules/.bin/uglifyjs" - usage () { printf "Usage: build-umd \n" } @@ -21,7 +16,7 @@ gzip () { build_dev () { mkdir -p dist/ - NODE_ENV=development "$browserify" index.js \ + NODE_ENV=development browserify index.js \ --standalone=choo \ -t envify \ -g yo-yoify \ @@ -31,7 +26,7 @@ build_dev () { build_min () { mkdir -p dist/ - NODE_ENV=production "$browserify" index.js \ + NODE_ENV=production browserify index.js \ --standalone=choo \ -t envify \ -g unassertify \ @@ -41,7 +36,6 @@ build_min () { -t envify \ -p bundle-collapser/plugin \ | uglifyjs \ - | "$uglify" \ > dist/choo.min.js } diff --git a/scripts/test b/scripts/test index 08ddca3..e004fd1 100755 --- a/scripts/test +++ b/scripts/test @@ -3,43 +3,33 @@ # setting exit because we're linting and need to exit on failure set -e -dirname=$(dirname "$(readlink -f "$0")") - -dependency_check="$dirname/../node_modules/.bin/dependency-check" -tape_istanbul="$dirname/../node_modules/.bin/tape-istanbul" -browserify="$dirname/../node_modules/.bin/browserify" -standard="$dirname/../node_modules/.bin/standard" -tape_run="$dirname/../node_modules/.bin/tape-run" -istanbul="$dirname/../node_modules/.bin/istanbul" -zuul="$dirname/../node_modules/.bin/zuul" - usage () { printf "Usage: test\n" } lint () { - "$standard" + standard } test_electron () { check_deps lint - "$browserify" tests/**/*.js \ + browserify tests/**/*.js \ -t es2020 \ -p proxyquire-universal \ - | "$tape_run" + | tape-run } test_cov () { check_deps lint - "$browserify" tests/**/*.js \ + browserify tests/**/*.js \ -t es2020 \ -p proxyquire-universal \ -p tape-istanbul/plugin \ - | "$tape_run" \ - | "$tape_istanbul" \ - && "$istanbul" report + | tape-run \ + | tape-istanbul \ + && istanbul report } test_server () { @@ -50,18 +40,18 @@ test_server () { } test_browser () { - NODE_ENV=test "$zuul" tests/browser/* + NODE_ENV=test zuul tests/browser/* } test_browser_local () { lint check_deps - NODE_ENV=test "$zuul" --local 8080 -- tests/browser/* + NODE_ENV=test zuul --local 8080 -- tests/browser/* } check_deps () { - "$dependency_check" . --entry 'index.js' - "$dependency_check" . --entry 'index.js' --extra --no-dev \ + dependency-check . --entry 'index.js' + dependency-check . --entry 'index.js' --extra --no-dev \ -i xhr }