Merge pull request #9 from fubhy/master

Switch to bin/bash since we are using a bash extension and use -f ins…
lint-staged · May 1, 2016 · 6ae2d98 · 6ae2d98
2 parents 46a7594 + 61005bf
commit 6ae2d98
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/scripts/eslint-staged.sh b/scripts/eslint-staged.sh
@@ -1,11 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
-executable=node_modules/.bin/staged-files
+executable=$(npm bin)/staged-files
 linter_name="eslint"
-linter_path=./node_modules/.bin/eslint
+linter_path=$(npm bin)/eslint
 lint_extensions="**/*.@(js|jsx)"
 
-if [[ -e "${linter_path}" ]]; then
+if [[ -f "${linter_path}" ]]; then
   echo "Running ${linter_name} on git staged files: ${lint_extensions}"
   ${executable} "${lint_extensions}" -- ${linter_path}
 else

diff --git a/scripts/flow-staged.sh b/scripts/flow-staged.sh
@@ -1,11 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
-executable=node_modules/.bin/staged-files
+executable=$(npm bin)/staged-files
 linter_name="flow"
-linter_path=flow
+linter_path=$(npm bin)/flow
 lint_extensions="**/*.@(js|jsx)"
 
-if [[ -e "${linter_path}" ]]; then
+if [[ -f "${linter_path}" ]]; then
   echo "Running ${linter_name} on git staged files: ${lint_extensions}"
   ${executable} "${lint_extensions}" -- ${linter_path}
 else

diff --git a/scripts/jscs-staged.sh b/scripts/jscs-staged.sh
@@ -1,11 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
-executable=node_modules/.bin/staged-files
+executable=$(npm bin)/staged-files
 linter_name="jscs"
-linter_path=./node_modules/.bin/jscs
+linter_path=$(npm bin)/jscs
 lint_extensions="**/*.@(js|jsx)"
 
-if [[ -e "${linter_path}" ]]; then
+if [[ -f "${linter_path}" ]]; then
   echo "Running ${linter_name} on git staged files: ${lint_extensions}"
   ${executable} "${lint_extensions}" -- ${linter_path}
 else

diff --git a/scripts/stylelint-staged.sh b/scripts/stylelint-staged.sh
@@ -1,11 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
-executable=node_modules/.bin/staged-files
+executable=$(npm bin)/staged-files
 linter_name="stylelint"
-linter_path=./node_modules/.bin/stylelint
+linter_path=$(npm bin)/stylelint
 lint_extensions="**/*.@(css|scss|less|styl)"
 
-if [[ -e "${linter_path}" ]]; then
+if [[ -f "${linter_path}" ]]; then
   echo "Running ${linter_name} on git staged files: ${lint_extensions}"
   ${executable} "${lint_extensions}" -- ${linter_path}
 else