helper/bwrap: move interfaceArgs before stringArgs

Signed-off-by: Ophestra Umiker <cat@ophivana.moe>

1 files changed, 9 insertions, 6 deletions

diff --git a/helper/bwrap/config.go b/helper/bwrap/config.go
index 4163a7df..fffddbe0 100644
--- a/helper/bwrap/config.go
+++ b/helper/bwrap/config.go
@@ -8,9 +8,9 @@ import (
 func (c *Config) Args() (args []string) {
 	b := c.boolArgs()
 	n := c.intArgs()
+	g := c.interfaceArgs()
 	s := c.stringArgs()
 	p := c.pairArgs()
-	g := c.interfaceArgs()
 
 	argc := 0
 	for i, arg := range b {
@@ -23,6 +23,9 @@ func (c *Config) Args() (args []string) {
 			argc += 2
 		}
 	}
+	for _, arg := range g {
+		argc += len(arg) * 3
+	}
 	for _, arg := range s {
 		argc += len(arg) * 2
 	}
@@ -41,6 +44,11 @@ func (c *Config) Args() (args []string) {
 			args = append(args, intArgs[i], strconv.Itoa(*arg))
 		}
 	}
+	for i, arg := range g {
+		for _, v := range arg {
+			args = append(args, v.Value(interfaceArgs[i])...)
+		}
+	}
 	for i, arg := range s {
 		for _, v := range arg {
 			args = append(args, stringArgs[i], v)
@@ -51,11 +59,6 @@ func (c *Config) Args() (args []string) {
 			args = append(args, pairArgs[i], v[0], v[1])
 		}
 	}
-	for i, arg := range g {
-		for _, v := range arg {
-			args = append(args, v.Value(interfaceArgs[i])...)
-		}
-	}
 
 	return
 }