summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.go15
-rw-r--r--unix.go4
2 files changed, 12 insertions, 7 deletions
diff --git a/main.go b/main.go
index 8f8984a..82fc073 100644
--- a/main.go
+++ b/main.go
@@ -163,6 +163,7 @@ func repoworld() {
break
}
}
+ newCmds = append(newCmds, []string{"cd", "."})
newCmds = append(newCmds, []string{"rm", "-rf", "go/src/"})
newCmds = append(newCmds, []string{"chmod", "700", "-R", "go/pkg/"})
newCmds = append(newCmds, []string{"rm", "-rf", "go/pkg/"})
@@ -179,17 +180,21 @@ func repoworld() {
buildOptions.NewLabel("get autotypist")
buildOptions.NewButton("go get", func () {
var newCmds [][]string
- newCmds = append(newCmds, []string{"mkdir", "-p", "~/go/src/go.wit.com/apps"})
+ newCmds = append(newCmds, []string{"cd", "."})
+ newCmds = append(newCmds, []string{"mkdir", "-p", "go/src/go.wit.com/apps/"})
newCmds = append(newCmds, []string{"cd", "go/src/go.wit.com/apps/"})
newCmds = append(newCmds, []string{"go", "get", "-v", "-u", "go.wit.com/apps/myrepos"})
newCmds = append(newCmds, []string{"cd", "go/src/go.wit.com/apps/myrepos"})
newCmds = append(newCmds, []string{"go", "get", "-v", "-u", "."})
- newCmds = append(newCmds, []string{"go", "get", "-v", "-u", "go.wit.com/gui/toolkits"})
- newCmds = append(newCmds, []string{"cd", "go/src/go.wit.com/gui/toolkits"})
+ newCmds = append(newCmds, []string{"go", "get", "-v", "go.wit.com/gui/toolkits"})
+ newCmds = append(newCmds, []string{"cd", "go/src/go.wit.com/gui/toolkits/andlabs"})
+ newCmds = append(newCmds, []string{"go", "get", "-v", "-u", "."})
+ newCmds = append(newCmds, []string{"cd", "go/src/go.wit.com/gui/toolkits/gocui"})
newCmds = append(newCmds, []string{"go", "get", "-v", "-u", "."})
- newCmds = append(newCmds, []string{"go", "make"})
+ newCmds = append(newCmds, []string{"cd", "go/src/go.wit.com/gui/toolkits"})
+ newCmds = append(newCmds, []string{"make"})
newCmds = append(newCmds, []string{"cd", "go/src/go.wit.com/apps/myrepos"})
- newCmds = append(newCmds, []string{"go", "make"})
+ newCmds = append(newCmds, []string{"make"})
script = newCmds
setGitCommands()
doit.Enable()
diff --git a/unix.go b/unix.go
index d881e54..30793d1 100644
--- a/unix.go
+++ b/unix.go
@@ -34,12 +34,12 @@ func goMake(dryRun string) bool {
cmd := line[0]
s := strings.Join(line[1:], " ")
path := repopath + workingPath
- log.Warn("NEED TO RUN path =", path, "cmd =", cmd, "argv:", s)
+ log.Warn("NEED TO RUN path =", path, "cmd =", cmd, s)
if dryRun == "--dry-run" {
continue
}
if dryRun == "--doit" {
- log.Warn("Actually RUN path =", path, "cmd =", cmd, "argv:", s)
+ log.Warn("Actually RUN path =", path, "cmd =", cmd, s)
err, b, output := repostatus.RunCmd(repopath, line)
if err != nil {
log.Info("ABEND EXECUTION")