From 8d53c61fc2c83c04ea4802198f1f42665360100f Mon Sep 17 00:00:00 2001 From: mitchell Date: Wed, 13 Dec 2023 15:47:40 -0500 Subject: [PATCH] Go back to ignoring '-v' for installer. install.sh and install.ps1 will forward that flag, and it should not be interpreted as --version. --- cmd/state-installer/cmd.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/state-installer/cmd.go b/cmd/state-installer/cmd.go index e4bd23a498..c570546454 100644 --- a/cmd/state-installer/cmd.go +++ b/cmd/state-installer/cmd.go @@ -186,15 +186,14 @@ func main() { Value: ¶ms.path, }, { - Name: "version", - Shorthand: "v", - Value: ¶ms.showVersion, + Name: "version", // note: no shorthand because install.sh uses -v for selecting version + Value: ¶ms.showVersion, }, // The remaining flags are for backwards compatibility (ie. we don't want to error out when they're provided) {Name: "nnn", Shorthand: "n", Hidden: true, Value: &garbageBool}, // don't prompt; useless cause we don't prompt anyway {Name: "channel", Hidden: true, Value: &garbageString}, {Name: "bbb", Shorthand: "b", Hidden: true, Value: &garbageString}, - {Name: "vvv", Hidden: true, Value: &garbageString}, + {Name: "vvv", Shorthand: "v", Hidden: true, Value: &garbageString}, {Name: "source-path", Hidden: true, Value: &garbageString}, }, []*captain.Argument{