Adjust to get_tool_flags() change, convert back to string where required

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

diff --git a/generic/e2lib.lua b/generic/e2lib.lua
index acd7e0a1a1199687411012dfce8f72a666fe9659..ac46c27dac6182a3e6855d1a830b1df0cfffb000 100644 (file)
--- a/generic/e2lib.lua
+++ b/generic/e2lib.lua
@@ -2206,6 +2206,8 @@ function e2lib.sha1sum(path)
         return false, e:cat(re)
     end
 
+    sha1sum_flags = table.concat(sha1sum_flags, " ")
+
     cmd = string.format("%s %s %s", e2lib.shquote(sha1sum), sha1sum_flags,
         e2lib.shquote(path))
 

diff --git a/generic/e2option.lua b/generic/e2option.lua
index 628c080fef801985e451049f6154872e86328c23..2b1f08e9decbd99de39ce2a807c2eea158657737 100644 (file)
--- a/generic/e2option.lua
+++ b/generic/e2option.lua
@@ -464,7 +464,10 @@ function e2option.showtoolmanpage()
         viewerflags = tools.get_tool_flags(s)
         if viewer then
             table.insert(cmd, e2lib.shquote(viewer))
-            if viewerflags and viewerflags ~= "" then
+            if viewerflags then
+                viewerflags = table.concat(viewerflags, " ")
+            end
+            if viewerflags ~= "" then
                 table.insert(cmd, viewerflags)
             end
 

diff --git a/generic/transport.lua b/generic/transport.lua
index 969db7af7b382566537e98de87cb6ce2e6904fd1..c3d024af9baf9726b3f26e1864faf14836fe7ce6 100644 (file)
--- a/generic/transport.lua
+++ b/generic/transport.lua
@@ -70,6 +70,8 @@ local function rsync_ssh(opts, src, dest)
         return false, re
     end
 
+    rshflags = table.concat(rshflags, " ")
+
     if rshflags ~= "" then
         rsh = string.format("%s %s", rsh, rshflags)
     end

diff --git a/local/e2-help.lua b/local/e2-help.lua
index da78a70b9c277a8587752491ec53f94be1be082f..8d2237d4cd01ebc2fb097bc901884f01a0ed82ba 100644 (file)
--- a/local/e2-help.lua
+++ b/local/e2-help.lua
@@ -179,8 +179,8 @@ local function display_man_page(doc)
     table.insert(cmd, e2lib.shquote(viewer))
 
     local viewerflags = tools.get_tool_flags("man")
-    if viewerflags and viewerflags ~= "" then
-        table.insert(cmd, viewerflags)
+    if viewerflags and #viewerflags > 0 then
+        table.insert(cmd, table.concat(viewerflags, " "))
     end
 
     table.insert(cmd, e2lib.shquote(e2lib.join(doc.path, doc.filename)))

diff --git a/plugins/git.lua b/plugins/git.lua
index 1ef414c5d6246f6ff093e5885c6a1a8e32db4389..0c5cfb6a5800c5ce96ca67a25f7b4462e3681528 100644 (file)
--- a/plugins/git.lua
+++ b/plugins/git.lua
@@ -385,6 +385,9 @@ function git.prepare_source(info, sourcename, sourceset, buildpath)
         if not tarflags then
             return false, e:cat(re)
         end
+
+        tarflags = table.concat(tarflags, " ")
+
         local cmd1 = string.format("%s %s -c -C %s/%s --exclude '.git' .",
             e2lib.shquote(tar), tarflags, e2lib.shquote(info.root),
             e2lib.shquote(src.working))