From: Martin Dietze <di@fh-wedel.de>
Date: Thu, 21 Sep 2006 12:28:49 +0000 (+0000)
Subject: elvis: some finetuning
X-Git-Tag: Release-2010-05/1~9453^2~742
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3afea35fb6c6be5b65b4a9af1de5c30f1beb774b;p=openembedded.git

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 178a8447b1..0e26c0126a 100644
--- 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 49fe5f2a1f..6f0f19fc39 100644
--- 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"