X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tools%2Fgst-indent;h=a9b8bfe430ca2d2263965e2cc010186d46b5224d;hb=ed4f8e368a597c5fd1f48a22ab87051fb30b1bd1;hp=b3cff4793cbcc9592c0183f5a7487543df6ff769;hpb=35e1103446d521028a8c96bc3bda23c4a9b04931;p=platform%2Fupstream%2Fgstreamer.git

diff --git a/tools/gst-indent b/tools/gst-indent
index b3cff47..a9b8bfe 100755
--- a/tools/gst-indent
+++ b/tools/gst-indent
@@ -1,16 +1,17 @@
 #!/bin/sh
 
-version=`gnuindent --version 2>/dev/null`
-if test "x$version" = "x"; then
-  version=`indent --version 2>/dev/null`
-  if test "x$version" = "x"; then
-    echo "GStreamer git pre-commit hook:"
-    echo "Did not find GNU indent, please install it before continuing."
-    exit 1
+for execname in gnuindent gindent indent; do
+  version=`$execname --version 2>/dev/null`
+  if test "x$version" != "x"; then
+    INDENT=$execname
+    break
   fi
-  INDENT=indent
-else
-  INDENT=gnuindent
+done
+
+if test -z $INDENT; then
+  echo "GStreamer git pre-commit hook:"
+  echo "Did not find GNU indent, please install it before continuing."
+  exit 1
 fi
 
 case `$INDENT --version` in
@@ -23,6 +24,9 @@ case `$INDENT --version` in
       ;;
 esac
 
+# Run twice. GNU indent isn't idempotent
+# when run once
+for i in 1 2; do
 $INDENT \
   --braces-on-if-line \
   --case-brace-indentation0 \
@@ -36,4 +40,6 @@ $INDENT \
   --honour-newlines \
   --tab-size8 \
   --indent-level2 \
-  $*
+  --leave-preprocessor-space \
+  $* || exit $?
+done