From 35b714231768d11b82e575701ca5c7a081e2c542 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Wed, 1 Jan 2025 19:28:58 +0900 Subject: fortify: show system info when instance is not specified This contains useful information not obtainable by external tools. Signed-off-by: Ophestra --- main.go | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index 15215864..2449b681 100644 --- a/main.go +++ b/main.go @@ -16,7 +16,6 @@ import ( "git.gensokyo.uk/security/fortify/internal/app" "git.gensokyo.uk/security/fortify/internal/fmsg" "git.gensokyo.uk/security/fortify/internal/linux" - "git.gensokyo.uk/security/fortify/internal/state" "git.gensokyo.uk/security/fortify/internal/system" ) @@ -128,24 +127,20 @@ func main() { // Ignore errors; set is set for ExitOnError. _ = set.Parse(args[1:]) - var ( - config *fst.Config - instance *state.State - name string - ) - - if len(set.Args()) != 1 { + switch len(set.Args()) { + case 0: // system + printShowSystem(short) + case 1: // instance + name := set.Args()[0] + config, instance := tryShort(name) + if config == nil { + config = tryPath(name) + } + printShowInstance(instance, config, short) + default: fmsg.Fatal("show requires 1 argument") - } else { - name = set.Args()[0] - config, instance = tryShort(name) - } - - if config == nil { - config = tryPath(name) } - printShow(instance, config, short) fmsg.Exit(0) case "app": // launch app from configuration file if len(args) < 2 { -- cgit v1.3.1