Move upgradeApk to upgrade.go

cmd/fdroidcl/install.go

@@ -62,12 +62,3 @@ func installApk(device *adb.Device, apk *fdroidcl.Apk, path string) {
 	}
 	fmt.Println("done")
 }
-
-func upgradeApk(device *adb.Device, apk *fdroidcl.Apk, path string) {
-	fmt.Printf("Upgrading %s... ", apk.App.ID)
-	if err := device.Upgrade(path); err != nil {
-		fmt.Println()
-		log.Fatalf("Could not upgrade %s: %v", apk.App.ID, err)
-	}
-	fmt.Println("done")
-}

cmd/fdroidcl/upgrade.go

@@ -4,7 +4,11 @@
 package main
 
 import (
+	"fmt"
 	"log"
+
+	"github.com/mvdan/fdroidcl"
+	"github.com/mvdan/fdroidcl/adb"
 )
 
 var cmdUpgrade = &Command{
@@ -34,3 +38,12 @@ func runUpgrade(args []string) {
 	}
 	downloadAndDo(apps, device, upgradeApk)
 }
+
+func upgradeApk(device *adb.Device, apk *fdroidcl.Apk, path string) {
+	fmt.Printf("Upgrading %s... ", apk.App.ID)
+	if err := device.Upgrade(path); err != nil {
+		fmt.Println()
+		log.Fatalf("Could not upgrade %s: %v", apk.App.ID, err)
+	}
+	fmt.Println("done")
+}