From: ng0 <ng0@n0.is>
Date: Fri, 15 Mar 2019 13:31:06 +0000 (+0000)
Subject: pre-commit: fix rtws location, test for dos2unix
X-Git-Tag: v0.11.1~77
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=29953dcd965d8b2a6fe2e0d9220bc0066005ffa5;p=oweals%2Fgnunet.git

pre-commit: fix rtws location, test for dos2unix
---

diff --git a/pre-commit b/pre-commit
index 777728a6b..46a7c2a4b 100755
--- a/pre-commit
+++ b/pre-commit
@@ -12,10 +12,9 @@ find $PATHS -name "*.c" -exec indent {} \;
 find $PATHS -name "*.h" -exec indent {} \;
 find $PATHS -name "*.c" -exec indent {} \;
 find $PATHS -name "*.h" -exec indent {} \;
-find $PATHS -name "*.c" -exec contrib/removetrailingwhitespace.py {} \;
-find $PATHS -name "*.h" -exec contrib/removetrailingwhitespace.py {} \;
-if test -x "`which 'dos2unix'`"
-then
+find $PATHS -name "*.c" -exec contrib/scripts/removetrailingwhitespace.py {} \;
+find $PATHS -name "*.h" -exec contrib/scripts/removetrailingwhitespace.py {} \;
+if test -n "`dos2unix -V | head -n1 | awk '{print $1 $2}'`"; then
   find $PATHS -name "*.c" -exec dos2unix {} \;
   find $PATHS -name "*.h" -exec dos2unix {} \;
 fi