[oe-commits] org.oe.dev elvis: some finetuning

[MartinDietze commit]

elvis: some finetuning
* added update-alternatives calls to replace/set /bin/vi link
* minor fixes to configuration in elvis-tiny to avoid warnings when loading

Author: MartinDietze at openembedded.org
Branch: org.openembedded.dev
Revision: a195e28b0a5f0b295b54615a438d2ad23fa25a0d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a195e28b0a5f0b295b54615a438d2ad23fa25a0d
Files:
1
packages/elvis/elvis-tiny_2.2.0.bb
packages/elvis/elvis_2.2.0.bb
Diffs:

#
# mt diff -rcf9fea03932ab53b7256b39d357095c4020653b0 -ra195e28b0a5f0b295b54615a438d2ad23fa25a0d
#
# 
# 
# patch "packages/elvis/elvis-tiny_2.2.0.bb"
#  from [7bc779dbbb76cd34eb7da87bed1ebca8c13ef307]
#    to [44238896eeac0d89522c071946d0aedafa604757]
# 
# patch "packages/elvis/elvis_2.2.0.bb"
#  from [3277d180abbddf72838989b4514239d9beb8459e]
#    to [85643eeee38d92347c2d984f7fff1b766a171729]
# 
============================================================
--- packages/elvis/elvis-tiny_2.2.0.bb	7bc779dbbb76cd34eb7da87bed1ebca8c13ef307
+++ packages/elvis/elvis-tiny_2.2.0.bb	44238896eeac0d89522c071946d0aedafa604757
@@ -12,7 +12,8 @@ do_install_append() {
 }
 
 do_install_append() {
-	mv ${D}/etc/elvis/elvis.clr ${D}/etc/elvis/elvis.clr-orig
+	sed -i -e "s/^source\(.* .*elvis.clr.*\)/\"source\1/" ${D}/etc/elvis/elvis.ini
+	sed -i -e "s/^set\(.*lptype.*\)/\"set\1/" ${D}/etc/elvis/elvis.ini
 }
 
 PACKAGES = "${PN}"
============================================================
--- packages/elvis/elvis_2.2.0.bb	3277d180abbddf72838989b4514239d9beb8459e
+++ packages/elvis/elvis_2.2.0.bb	85643eeee38d92347c2d984f7fff1b766a171729
@@ -45,6 +45,14 @@ do_install() {
 	rm -rf ${D}/usr/share/elvis/icons
 }
 
+pkg_postinst_${PN}() {
+	update-alternatives --install /bin/vi vi /usr/bin/elvis 100
+}
+
+pkg_prerm_${PN} () {
+	update-alternatives --remove vi /usr/bin/elvis
+}
+
 PACKAGES = "${PN} ${PN}-doc ${PN}-tools"
 FILES_${PN}-doc = "/usr/share/elvis/manual /usr/share/elvis/README"
 FILES_${PN}-tools = "/usr/bin/elvfmt /usr/bin/elvtags /usr/bin/ref"