Merge pull request kubernetes#231 from brendandburns/hooks

Fixed the boilerplate hook to work on OS X, where apparently wc add's spaces
duda · Jun 24, 2014 · e4c47f0 · e4c47f0
2 parents 4f81008 + 2c404ab
commit e4c47f0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/hooks/boilerplate.sh b/hooks/boilerplate.sh
@@ -2,8 +2,8 @@
 
 # Print 1 if the file in $1 has the correct boilerplate header, 0 otherwise.
 FILE=$1
-LINES=$(cat "$(dirname $0)/boilerplate.txt" | wc -l)
-DIFFER=$(head -$LINES "${FILE}" | diff -q - "$(dirname $0)/boilerplate.txt")
+LINES=$(cat "$(dirname $0)/boilerplate.txt" | wc -l | tr -d ' ')
+DIFFER=$(head "-${LINES}" "${FILE}" | diff -q - "$(dirname $0)/boilerplate.txt")
 
 if [[ -z "${DIFFER}" ]]; then
   echo "1"