args: Allow setting version on command line

We were only support version from the YAML file, now support setting directly on the command line for swupd. Signed-off-by: Mark D Horn <[email protected]>
clearlinux · Oct 8, 2019 · a3ac0ad · a3ac0ad
1 parent 2187466
commit a3ac0ad
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/args/args.go b/args/args.go
@@ -57,6 +57,7 @@ type Args struct {
 	SwupdCertPath           string
 	SwupdStateClean         bool
 	SwupdFormat             string
+	SwupdVersion            string
 	SwupdContentURL         string
 	SwupdVersionURL         string
 	SwupdURL                string
@@ -194,6 +195,10 @@ func (args *Args) setCommandLineArgs() (err error) {
 		&args.SwupdFormat, "swupd-format", args.SwupdFormat, "Swupd --format argument",
 	)
 
+	flag.StringVar(
+		&args.SwupdVersion, "swupd-version", args.SwupdVersion, "Swupd --version argument",
+	)
+
 	flag.StringVar(
 		&args.SwupdContentURL, "swupd-contenturl", args.SwupdContentURL,
 		"Swupd --contenturl argument",

diff --git a/args/args_test.go b/args/args_test.go
@@ -434,6 +434,9 @@ func TestKernelAndCommandlineAllArgs(t *testing.T) {
 	if testArgs.SwupdMirror != "" {
 		t.Errorf("Command Line 'mirror' is not defaulted to ''")
 	}
+	if testArgs.SwupdVersion != "" {
+		t.Errorf("Command Line 'swupd-version' is not defaulted to ''")
+	}
 	if testArgs.PamSalt != "" {
 		t.Errorf("Command Line 'genpwd' is not defaulted to ''")
 	}

diff --git a/clr-installer/main.go b/clr-installer/main.go
@@ -13,6 +13,7 @@ import (
 	"path/filepath"
 	"reflect"
 	"regexp"
+	"strconv"
 	"strings"
 	"syscall"
 
@@ -289,6 +290,18 @@ func execute(options args.Args) error {
 	if options.SwupdFormat != "" {
 		md.SwupdFormat = options.SwupdFormat
 	}
+	if options.SwupdVersion != "" {
+		if strings.EqualFold(options.SwupdVersion, "latest") {
+			md.Version = 0
+		} else {
+			version, err := strconv.ParseUint(options.SwupdVersion, 10, 32)
+			if err == nil {
+				md.Version = uint(version)
+			} else {
+				log.Warning("Failed to parse swupd-version : %s; not-used!", options.SwupdVersion)
+			}
+		}
+	}
 
 	if options.AllowInsecureHTTPSet {
 		md.AllowInsecureHTTP = options.AllowInsecureHTTP