diff options
Diffstat (limited to 'doPublish.go')
| -rw-r--r-- | doPublish.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doPublish.go b/doPublish.go index 6c2c790..3b57214 100644 --- a/doPublish.go +++ b/doPublish.go @@ -6,6 +6,7 @@ package main import ( "fmt" "os" + "time" "go.wit.com/lib/fhelp" "go.wit.com/lib/gui/shell" @@ -37,16 +38,15 @@ func doPublish() error { me.sh.BadExit("merge failed", nil) } - if argv.Force { - cmd = []string{"forge", "--force", "merge", "check"} - } else { - cmd = []string{"forge", "merge", "check"} - } + cmd = []string{"forge", "merge", "check"} if _, err := shell.RunRealtimeError(cmd); err != nil { if _, err := shell.RunVerbose(cmd); err != nil { me.sh.BadExit("merge failed", nil) } } + // todo: os.Stat() file + time.Sleep(time.Second) + me.forge.Repos.Load() if err := doInstall(); err != nil { log.Info("doInstall() failed", err) |