From 21720f128393171c39fe87ea6eb7afcf2846003b Mon Sep 17 00:00:00 2001 From: squidfunk Date: Wed, 2 Nov 2016 09:18:00 +0100 Subject: [PATCH] Switch to /Volumes/Shipwreck/github/squidfunk/mkdocs-material-experimental/node_modules/.bin --- bin/build | 7 ++----- bin/clean | 7 ++----- bin/lint | 9 +++------ bin/start | 7 ++----- bin/test | 7 ++----- 5 files changed, 11 insertions(+), 26 deletions(-) diff --git a/bin/build b/bin/build index ebca55461..c9592f64b 100755 --- a/bin/build +++ b/bin/build @@ -20,15 +20,12 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -# Resolve root directory -ROOT=`dirname $0`/.. - # Check if "npm install" was executed -if [[ ! -d $ROOT/node_modules ]]; then +if [[ ! -d `npm bin` ]]; then echo "\"node_modules\" not found:" echo "npm install" exit 1 fi # Run command -$ROOT/node_modules/.bin/gulp build --clean --optimize --revision +`npm bin`/gulp build --clean --optimize --revision diff --git a/bin/clean b/bin/clean index 3e5f6ce10..0a554b8bb 100755 --- a/bin/clean +++ b/bin/clean @@ -20,15 +20,12 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -# Resolve root directory -ROOT=`dirname $0`/.. - # Check if "npm install" was executed -if [[ ! -d $ROOT/node_modules ]]; then +if [[ ! -d `npm bin` ]]; then echo "\"node_modules\" not found:" echo "npm install" exit 1 fi # Run command -$ROOT/node_modules/.bin/gulp clean +`npm bin`/gulp clean diff --git a/bin/lint b/bin/lint index a54ee7bc5..d92e401f3 100755 --- a/bin/lint +++ b/bin/lint @@ -20,22 +20,19 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -# Resolve root directory -ROOT=`dirname $0`/.. - # Check if "npm install" was executed -if [[ ! -d $ROOT/node_modules ]]; then +if [[ ! -d `npm bin` ]]; then echo "\"node_modules\" not found:" echo "npm install" exit 1 fi # Run ESLint -$ROOT/node_modules/.bin/eslint . +`npm bin`/eslint . ESLINT=$? # Run Sass-Lint -$ROOT/node_modules/.bin/sass-lint -c .sass-lint.yml -vq +`npm bin`/sass-lint -c .sass-lint.yml -vq SASSLINT=$? # If one command failed, exit with error diff --git a/bin/start b/bin/start index 18a3700d4..f0f2359a4 100755 --- a/bin/start +++ b/bin/start @@ -20,15 +20,12 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -# Resolve root directory -ROOT=`dirname $0`/.. - # Check if "npm install" was executed -if [[ ! -d $ROOT/node_modules ]]; then +if [[ ! -d `npm bin` ]]; then echo "\"node_modules\" not found:" echo "npm install" exit 1 fi # Run command -$ROOT/node_modules/.bin/gulp watch --no-lint +`npm bin`/gulp watch --no-lint diff --git a/bin/test b/bin/test index 7a30bd210..5384f50ca 100755 --- a/bin/test +++ b/bin/test @@ -20,15 +20,12 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -# Resolve root directory -ROOT=`dirname $0`/.. - # Check if "npm install" was executed -if [[ ! -d $ROOT/node_modules ]]; then +if [[ ! -d `npm bin` ]]; then echo "\"node_modules\" not found:" echo "npm install" exit 1 fi # Run command -$ROOT/node_modules/.bin/gulp test +`npm bin`/gulp test