From: Gordon Hecker <gh@emlix.com>
Date: Fri, 23 Oct 2009 12:37:16 +0000 (+0200)
Subject: get EDITOR from environment in e2lib, take vi as the default editor
X-Git-Tag: e2factory-2.3.2rc1~33
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=97b28209b20b41474d6cc0b8637a5c5a16f58ac3;p=e2factory.git

get EDITOR from environment in e2lib, take vi as the default editor

Signed-off-by: Gordon Hecker <gh@emlix.com>
---

diff --git a/generic/e2lib.lua b/generic/e2lib.lua
index 8737b38..a610cbd 100644
--- a/generic/e2lib.lua
+++ b/generic/e2lib.lua
@@ -137,6 +137,7 @@ function e2lib.init()
   local getenv = {
 	{ name = "HOME", required = true },
 	{ name = "USER", required = true },
+	{ name = "EDITOR", required = false, default = "vi" },
 	{ name = "TERM", required = false, default = "linux" },
 	{ name = "E2_CONFIG", required = false },
 	{ name = "TMPDIR", required = false, default = "/tmp" },
diff --git a/local/cf.lua b/local/cf.lua
index 9e828a6..e045163 100755
--- a/local/cf.lua
+++ b/local/cf.lua
@@ -65,10 +65,7 @@ if not rc then
   e2lib.abort(re)
 end
 
-local editor = os.getenv("EDITOR")
-if not editor then
-  editor = "vi"
-end
+local editor = e2lib.osenv["EDITOR"]
 
 local commands = {}