[DRE-commits] [SCM] pkg-ruby-extras.git branch, master, updated. 3f821c64c832a9ded12ed68e339b51e4995ba139

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 61c4cb7bc4a36685736a0ae0dc887c3b836a0b88
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Wed Sep 14 13:34:45 2011 -0700

    a better diff against the old .mrconfig

diff --git a/make-mrconfig b/make-mrconfig
index ab87099..d3130d2 100755
--- a/make-mrconfig
+++ b/make-mrconfig
@@ -90,7 +90,12 @@ EOF
 #done
 
 # Warn if changes have been made
-if [ -f ${OUTPUT}\~ ] && diff -u ${OUTPUT}\~ ${OUTPUT}; then
+if which colordiff >/dev/null; then
+	diff=colordiff
+else
+	diff=diff
+fi
+if [ -f ${OUTPUT}\~ ] && $diff -u ${OUTPUT}\~ ${OUTPUT}; then
     rm ${OUTPUT}\~
     msg "no changes"
 else

-- 
pkg-ruby-extras.git