get xterm settings from forgev0.22.41v0.22.40v0.22.39

1 files changed, 26 insertions, 7 deletions

diff --git a/xterm.go b/xterm.go
index 9722209..218656d 100644
--- a/xterm.go
+++ b/xterm.go
@@ -1,27 +1,45 @@
 package repolist
 
 import (
-	"os"
-	"os/exec"
-	"strings"
-
 	"go.wit.com/lib/gui/shell"
 	"go.wit.com/log"
 )
 
 func (rs *RepoRow) XtermNohup(cmdline string) {
 	p := rs.pb.GetFullPath()
-	shell.XtermCmd(p, []string{cmdline})
+	var xterm []string
+	xterm = append(xterm, me.forge.Config.Xterm)
+	xterm = append(xterm, me.forge.Config.XtermArgv...)
+	xterm = append(xterm, "bash")
+	xterm = append(xterm, "-c")
+	xterm = append(xterm, cmdline)
+	shell.XtermCmd(p, xterm)
 }
+
 func (rs *RepoRow) Xterm(cmdline string) {
 	p := rs.pb.GetFullPath()
-	shell.XtermCmd(p, []string{cmdline})
+	var xterm []string
+	xterm = append(xterm, me.forge.Config.Xterm)
+	xterm = append(xterm, me.forge.Config.XtermArgv...)
+	xterm = append(xterm, "bash")
+	xterm = append(xterm, "-c")
+	xterm = append(xterm, cmdline)
+	shell.XtermCmd(p, xterm)
 }
+
 func (rs *RepoRow) XtermWait(cmdline string) {
 	p := rs.pb.GetFullPath()
-	shell.XtermCmdWait(p, []string{cmdline})
+	var xterm []string
+	xterm = append(xterm, me.forge.Config.Xterm)
+	xterm = append(xterm, me.forge.Config.XtermArgv...)
+	xterm = append(xterm, "bash")
+	xterm = append(xterm, "-c")
+	xterm = append(xterm, cmdline)
+	log.Info("repolist.XtermWait()", p, cmdline)
+	shell.XtermCmdWait(p, xterm)
 }
 
+/*
 func (rs *RepoRow) XtermBash(args []string) {
 	var argsX = []string{"-geometry", "120x40"}
 	tmp := strings.Join(args, " ") + ";bash"
@@ -43,3 +61,4 @@ func (rs *RepoRow) XtermBash(args []string) {
 		log.Log(WARN, "cmd = xterm", argsX)
 	}
 }
+*/