From: Tobias Ulmer <tu@emlix.com>
Date: Fri, 29 Nov 2013 17:41:34 +0000 (+0100)
Subject: Simplify man viewer execution
X-Git-Tag: e2factory-2.3.15rc1~320
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=5329af05e2e976681da4034abffa2734c9aad870;p=e2factory.git

Simplify man viewer execution

Signed-off-by: Tobias Ulmer <tu@emlix.com>
---

diff --git a/generic/e2option.lua b/generic/e2option.lua
index be1fd4b..da9e4d1 100644
--- a/generic/e2option.lua
+++ b/generic/e2option.lua
@@ -459,33 +459,32 @@ function e2option.showtoolmanpage()
     end
 
     local cmd = {}
-    for _,s in ipairs({"man"}) do
-        local viewer, viewerflags
-
-        viewer = tools.get_tool(s)
-        viewerflags = tools.get_tool_flags(s)
-        if viewer then
-            table.insert(cmd, e2lib.shquote(viewer))
-            if viewerflags then
-                viewerflags = table.concat(viewerflags, " ")
-            end
-            if viewerflags ~= "" then
-                table.insert(cmd, viewerflags)
-            end
+    local viewer, viewerflags
 
-            break
+    viewer = tools.get_tool("man")
+    if viewer then
+        table.insert(cmd, viewer)
+
+        viewerflags = tools.get_tool_flags("man")
+        if viewerflags then
+            for _,flag in ipairs(viewerflags) do
+                table.insert(cmd, flag)
+            end
         end
     end
 
-    if #cmd < 1 then
+    if #cmd == 0 then
         return false, err.new("Could not find manual viewer to display help")
     end
 
-    table.insert(cmd, e2lib.shquote(mpage))
+    table.insert(cmd, mpage)
 
-    local rc = os.execute(table.concat(cmd, ' '))
+    local rc, re = e2lib.callcmd(cmd, {})
+    if not rc then
+        return false, re
+    end
 
-    return rc/256 -- XXX: os.execute
+    return rc
 end
 
 return strict.lock(e2option)