Ajout fichier de configuration colordiff

diff --git a/stage3/misc/colordiffrc b/stage3/misc/colordiffrc
new file mode 100644 (file)
index 0000000..51bcc4d
--- /dev/null
+++ b/stage3/misc/colordiffrc
@@ -0,0 +1,26 @@
+# Example colordiffrc file for dark backgrounds
+#
+# Set banner=no to suppress authorship info at top of
+# colordiff output
+banner=no
+# By default, when colordiff output is being redirected
+# to a file, it detects this and does not colour-highlight
+# To make the patch file *include* colours, change the option
+# below to 'yes'
+color_patches=no
+# 
+# available colours are: white, yellow, green, blue,
+#                        cyan, red, magenta, black,
+#                        darkwhite, darkyellow, darkgreen,
+#                        darkblue, darkcyan, darkred,
+#                        darkmagenta, darkblack
+#
+# Can also specify 'none', 'normal' or 'off' which are all
+# aliases for the same thing, namely "don't colour highlight
+# this, use the default output colour"
+#
+plain=off
+newtext=darkgreen
+oldtext=darkred
+diffstuff=white
+cvsstuff=darkyellow

diff --git a/stage3/pkg/colordiff b/stage3/pkg/colordiff
index 2c056fd..78c8393 100644 (file)
--- a/stage3/pkg/colordiff
+++ b/stage3/pkg/colordiff
@@ -4,9 +4,6 @@ hvbuild()
 {
     PREFIX=/usr make -C ${LFS_TMP}/${PACKAGE} install
 
-    # Replace colordiff default values to match git-diff:
-    sed -e "s!\(newtext=\).*!\1darkgreen!" -i /etc/colordiffrc
-    sed -e "s!\(oldtext=\).*!\1darkred!" -i /etc/colordiffrc
-    sed -e "s!\(diffstuff=\).*!\1white!" -i /etc/colordiffrc
-    sed -e "s!\(cvsstuff=\).*!\1darkyellow!" -i /etc/colordiffrc
+    install -v -m644 ${SCRDIR}/misc/colordiffrc /etc
 }
+