From 1fa1dc14f76bf3688190094c4cba13a4171dcf0e Mon Sep 17 00:00:00 2001 From: "gobo72@gmail.com" Date: Thu, 19 Jul 2012 14:01:27 +0000 Subject: [PATCH] Ajout fichier de configuration colordiff --- stage3/misc/colordiffrc | 26 ++++++++++++++++++++++++++ stage3/pkg/colordiff | 7 ++----- 2 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 stage3/misc/colordiffrc diff --git a/stage3/misc/colordiffrc b/stage3/misc/colordiffrc new file mode 100644 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 --- 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 } + -- 2.20.1