New Option to clean-up swupd state directory

Fixes #215

We already default to placing the swupd state cache directory
in the installation target. This change implements the only
missing part of the request to allow removing the state directory.

Signed-off-by: Mark D Horn <mark.d.horn@intel.com>

args/args.go

@@ -47,6 +47,7 @@ type Args struct {
 	CryptPassFile           string
 	SwupdMirror             string
 	SwupdStateDir           string
+	SwupdStateClean         bool
 	SwupdFormat             string
 	SwupdContentURL         string
 	SwupdVersionURL         string
@@ -151,6 +152,11 @@ func (args *Args) setCommandLineArgs() (err error) {
 		&args.SwupdStateDir, "swupd-state", args.SwupdMirror, "Swupd state-dir",
 	)
 
+	flag.BoolVar(
+		&args.SwupdStateClean, "swupd-clean",
+		false, "Clean Swupd state-dir content after install",
+	)
+
 	flag.StringVar(
 		&args.SwupdFormat, "swupd-format", args.SwupdFormat, "Swupd --format argument",
 	)

controller/controller.go

@@ -504,6 +504,17 @@ func contentInstall(rootDir string, version string, model *model.SystemInstall,
 	}
 	prg.Success()
 
+	// Clean-up State Directory content
+	if options.SwupdStateClean {
+		msg = "Cleaning Swupd state directory"
+		prg = progress.NewLoop(msg)
+		log.Info(msg)
+		if err = sw.CleanUpState(); err != nil {
+			log.ErrorError(err)
+		}
+		prg.Success()
+	}
+
 	return nil, nil
 }
 

swupd/swupd.go

@@ -9,6 +9,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"os"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -427,3 +428,16 @@ func LoadBundleList() ([]*Bundle, error) {
 
 	return root.Bundles, nil
 }
+
+// CleanUpState removes the swupd state content directory
+func (s *SoftwareUpdater) CleanUpState() error {
+
+	log.Debug("Removing swupd state directory: %s", s.stateDir)
+
+	err := os.RemoveAll(s.stateDir)
+	if err != nil {
+		return errors.Wrap(err)
+	}
+
+	return nil
+}