[nagiosplug] tools/distclean: use git-clean when possible
Thomas Guyot-Sionnest
dermoth at users.sourceforge.net
Wed Apr 28 12:04:45 CEST 2010
Module: nagiosplug
Branch: master
Commit: b48c2bdd59783197c93cde531e6e8b9747c0a88f
Author: Thomas Guyot-Sionnest <dermoth at aei.ca>
Date: Wed Apr 28 05:28:22 2010 -0400
URL: http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug/nagiosplug;a=commit;h=b48c2bd
tools/distclean: use git-clean when possible
git-clean is much faster and more reliable...
Also add confdefs.h in gitignore, although this file is normally removed
at the end of the configure script.
---
.gitignore | 1 +
tools/distclean | 12 ++++++++++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
index da85629..7def6f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ NP-VERSION-FILE
/Cache.pm
/command.cfg
/compile
+/confdefs.h
/config.*
/configure
/debian
diff --git a/tools/distclean b/tools/distclean
index f5e0ece..f4ec20b 100755
--- a/tools/distclean
+++ b/tools/distclean
@@ -10,6 +10,18 @@ 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 -i distclean
More information about the Commits
mailing list