diff options
| -rw-r--r-- | argv.go | 2 | ||||
| -rw-r--r-- | doDebian.go | 15 | ||||
| -rw-r--r-- | doUpgrade.go | 18 | ||||
| -rw-r--r-- | main.go | 4 |
4 files changed, 31 insertions, 8 deletions
@@ -106,7 +106,7 @@ func (args) Appname() string { func (a args) DoAutoComplete(pb *prep.Auto) { if pb.Cmd == "" { - pb.Autocomplete3([]string{"--verbose", "--force", "push", "build", "debian", "upgrade", "macos", "git", "rdate"}) + pb.Autocomplete3([]string{"--version", "push", "build", "debian", "upgrade", "macos", "git", "rdate"}) } else { pb.SubCommand(pb.Goargs...) } diff --git a/doDebian.go b/doDebian.go index e14e555..63009b3 100644 --- a/doDebian.go +++ b/doDebian.go @@ -4,11 +4,26 @@ package main import ( + "path/filepath" + "go.wit.com/lib/protobuf/gitpb" "go.wit.com/log" ) func doDebian() { + // clean out old deb files + globPattern := filepath.Join(me.homedir, "incoming", "*.deb") + files, err := filepath.Glob(globPattern) + if err != nil { + log.Info("Error during globbing:", err) + badExit(err) + } + if len(files) > 0 { + cmd := []string{"rm"} + cmd = append(cmd, files...) + exitOnErrorRealtime(cmd) + } + initForge() found := gitpb.NewRepos() diff --git a/doUpgrade.go b/doUpgrade.go index 3d8d0c1..428c11d 100644 --- a/doUpgrade.go +++ b/doUpgrade.go @@ -6,7 +6,6 @@ package main import ( "fmt" - "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/zoopb" "go.wit.com/log" ) @@ -37,13 +36,24 @@ func doUpgrade() error { if !me.machine.IsInstalled(p.Name) { continue } + if argv.DryRun { log.Info("should install package", p.Name) } - cmd := []string{"apt", "install", p.Name} - log.Info("Running:", cmd) - shell.RunVerbose(cmd) + if argv.Force || argv.Upgrade.Force { + cmd := []string{"apt", "remove", p.Name} + log.Info("Running:", cmd) + exitOnError(cmd) + + cmd = []string{"apt", "install", "-y", p.Name} + log.Info("Running:", cmd) + exitOnError(cmd) + } else { + cmd := []string{"apt", "install", "-y", p.Name} + log.Info("Running:", cmd) + exitOnError(cmd) + } } okExit("installed") return nil @@ -96,8 +96,6 @@ func main() { okExit("") } - doListRepos() - if argv.MakeInstall != nil { if err := doInstall(); err != nil { log.Info("doInstall() failed", err) @@ -106,7 +104,7 @@ func main() { okExit("EVERYTHING BUILT!") } - okExit("everything compiled") + okExit("do what?") } // this is dumb. sync this with go-deb |