From 7eac43b9b24b9c03efefd65ef2e5eacd2d9bd694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 16 Mar 2016 12:03:22 +0000 Subject: [PATCH] Move upgradeApk to upgrade.go --- cmd/fdroidcl/install.go | 9 --------- cmd/fdroidcl/upgrade.go | 13 +++++++++++++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/cmd/fdroidcl/install.go b/cmd/fdroidcl/install.go index d56597c..71a8b94 100644 --- a/cmd/fdroidcl/install.go +++ b/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") -} diff --git a/cmd/fdroidcl/upgrade.go b/cmd/fdroidcl/upgrade.go index 334bc7d..4693edb 100644 --- a/cmd/fdroidcl/upgrade.go +++ b/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") +}