diff --git a/scripts/astyle-all.sh b/scripts/astyle-all.sh
index 047f4d93fde..6fe372bb71f 100755
--- a/scripts/astyle-all.sh
+++ b/scripts/astyle-all.sh
@@ -1,9 +1,6 @@
 #!/bin/bash
 
-if ! astyle.sh >/dev/null 2>&1; then
-	echo astyle.sh not found in path >&2
-	exit 1
-fi
+PATH=$PATH:$(dirname $0)
 
 set -e
 
diff --git a/scripts/astyle.sh b/scripts/astyle.sh
index 15a376b18e7..3b3d261831c 100755
--- a/scripts/astyle.sh
+++ b/scripts/astyle.sh
@@ -1,9 +1,15 @@
 #!/bin/bash
 
-#if ! qgsloggermig.pl >/dev/null 2>&1; then
-#	echo qgsloggermig.pl not found in path >&2
-#	exit 1
-#fi
+if ! type -p astyle >/dev/null; then
+	echo "astyle not found" >&2
+	exit 1	
+fi
+
+if ! type -p flip >/dev/null; then
+	flip() {
+		:
+	}
+fi
 
 set -e
 
@@ -23,8 +29,6 @@ export ARTISTIC_STYLE_OPTIONS="\
 --min-conditional-indent=-1 \
 --suffix=none"
 
-#--break-blocks \
-
 export ARTISTIC_STYLE_OPTIONS="\
 $ARTISTIC_STYLE_OPTIONS \
 --pad=oper \
@@ -32,7 +36,12 @@ $ARTISTIC_STYLE_OPTIONS \
 --unpad=paren"
 
 for f in "$@"; do
-	#flip -ub "$f" 
-    	#qgsloggermig.pl "$f"
+	if ! [ -f "$f" ]; then
+		echo "$f not found" >&2
+		continue
+        fi
+
+	flip -ub "$f" 
+	#qgsloggermig.pl "$f"
 	astyle $ARTISTIC_STYLE_OPTIONS "$f"
 done
diff --git a/scripts/prepare-commit.sh b/scripts/prepare-commit.sh
index a399d8ddca4..e2797b824c7 100755
--- a/scripts/prepare-commit.sh
+++ b/scripts/prepare-commit.sh
@@ -1,7 +1,17 @@
 #!/bin/bash
 
-if ! [ -x astyle.sh ]; then
-	PATH=$PATH:$(dirname $0)
+PATH=$PATH:$(dirname $0)
+
+if ! type -p astyle.sh >/dev/null; then
+	echo astyle.sh not found
+	exit 1
+fi
+
+if ! type -p colordiff >/dev/null; then
+	colordiff()
+	{
+		cat "$@"
+	}
 fi
 
 set -e
diff --git a/scripts/update-indent.sh b/scripts/update-indent.sh
index 098d98a308d..e0c417870d8 100755
--- a/scripts/update-indent.sh
+++ b/scripts/update-indent.sh
@@ -1,7 +1,11 @@
 #!/bin/bash
 
-if ! [ -x astyle.sh ]; then
-	PATH=$PATH:$(dirname $0)
+PATH=$PATH:$(dirname $0)
+
+if ! type -p colordiff >/dev/null; then
+	colordiff() {
+		cat "$@"
+	}
 fi
 
 set -e
@@ -23,7 +27,6 @@ echo "Checking changes between $REV0 and $REV1"
 ASTYLEDIFF=astyle.r$REV0-r$REV1.diff
 >$ASTYLEDIFF
 
-
 # reformat
 for f in $MODIFIED; do
 	case "$f" in
@@ -35,6 +38,11 @@ for f in $MODIFIED; do
                 ;;
         esac
 
+	if ! [ -s $f ]; then
+		# deleted
+	 	continue
+	fi
+
         m=$f.r$REV1.prepare
 
 	cp $f $m