more argv options

1 files changed, 4 insertions, 19 deletions

diff --git a/doUpgrade.go b/doUpgrade.go
index fda9a04..61006b9 100644
--- a/doUpgrade.go
+++ b/doUpgrade.go
@@ -11,26 +11,18 @@ import (
 )
 
 func doUpgrade() error {
-	var cmd []string
-
 	if !argv.DryRun {
 		checkSuperuser()
 
-		cmd = []string{"apt", "update"}
-		exitOnError(cmd)
-
-		cmd = []string{"apt", "install", "wit-tools"}
-		exitOnError(cmd)
+		aptUpdate()
 	}
 
 	me.machine, _ = zoopb.InitMachine()
-	// doAptUpgrade()
 
 	fmt.Println("Installed Packages:")
 	loop := me.machine.Wit.SortByName()
 	for loop.Scan() {
 		p := loop.Next()
-		// log.Info("apt install", p.Name)
 		if p.Name == "" {
 			log.Infof("odd /var/lib/apt/ list parse error. p.Name was blank (should be the package name) p=%v\n", p)
 			continue
@@ -56,17 +48,10 @@ func doUpgrade() error {
 		}
 
 		if argv.Force {
-			cmd := []string{"apt", "remove", "-y", p.Name}
-			log.Info("Running:", cmd)
-			exitOnError(cmd)
-
-			cmd = []string{"apt", "install", "-y", p.Name}
-			log.Info("Running:", cmd)
-			exitOnError(cmd)
+			aptRemove(p.Name)
+			aptInstall(p.Name)
 		} else {
-			cmd := []string{"apt", "install", "-y", p.Name}
-			log.Info("Running:", cmd)
-			exitOnError(cmd)
+			aptInstall(p.Name)
 		}
 	}
 	okExit("installed")