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

diff --git a/packages/elvis/elvis-tiny_2.2.0.bb b/packages/elvis/elvis-tiny_2.2.0.bb
index 178a844..0e26c01 100644 (file)
--- a/packages/elvis/elvis-tiny_2.2.0.bb
+++ b/packages/elvis/elvis-tiny_2.2.0.bb
@@ -12,7 +12,8 @@ do_configure_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}"

diff --git a/packages/elvis/elvis_2.2.0.bb b/packages/elvis/elvis_2.2.0.bb
index 49fe5f2..6f0f19f 100644 (file)
--- a/packages/elvis/elvis_2.2.0.bb
+++ b/packages/elvis/elvis_2.2.0.bb
@@ -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"