Display missing search string and URL when failed (Duncan Ferguson #2999924)

[nagiosplug.git] / tools / distclean

diff --git a/tools/distclean b/tools/distclean
index 0132d2d8a3107dea090878ccafc77ab7b08bb898..f4ec20bd1d11a7ae06cdc51ab551adf7253bf6e8 100755 (executable)
--- a/tools/distclean
+++ b/tools/distclean
@@ -10,12 +10,23 @@ if [ ! -f tools/distclean ]; then
   exit 1
 fi
 
+# First try git-clean, removing all ignored files will be perfect...
+if [ -d ".git" ]; then
+  echo "$0: Running 'git clean -fdX', this will remove all files ignored by git..."
+       git clean -fdX
+       if [ "$?" -eq "0" ]; then
+               echo "$0: Cleanup complete! Have a nice day..."
+               exit 0
+       fi
+       echo "$0: git-clean error, failing back to legacy cleanup!"
+fi
+
+# If we get here, then git-clean did not run or failed. Using the legacy method...
 if [ -f Makefile ]; then
   echo "$0: Makefile present. Cleaning up with 'make distclean'..."
-  make distclean
+  make -i distclean
   if [ $? -ne 0 ]; then
     echo "Uh-oh! Make distclean failed."
-    echo "Please run './config.status' and try again."
     exit 1
   fi
 fi
@@ -28,6 +39,7 @@ rm -f m4/Makefile.am
 
 echo "$0: Removing miscelanious files..."
 rm -f po/*.gmo po/stamp-po
+rm -f lib/tests/*.Po
 rm -f doc/developer-guidelines.html
 rm -f INSTALL install-sh missing
 rm -f plugins/t/check_nagios.nagios?.status.???.tmp