From 16e674782abbda8c85eac2e7d0c5c22e8cfbf5de Mon Sep 17 00:00:00 2001 From: Ophestra Date: Fri, 14 Nov 2025 22:14:49 +0900 Subject: [PATCH] cmd/hakurei: reorder show entries This order semantically makes more sense and generally looks tidier. Signed-off-by: Ophestra --- cmd/hakurei/print.go | 12 ++++++------ cmd/hakurei/print_test.go | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/hakurei/print.go b/cmd/hakurei/print.go index 62131db..7e3400a 100644 --- a/cmd/hakurei/print.go +++ b/cmd/hakurei/print.go @@ -90,12 +90,6 @@ func printShowInstance( t.Printf(" Groups:\t%s\n", strings.Join(config.Groups, ", ")) } if config.Container != nil { - if config.Container.Home != nil { - t.Printf(" Home:\t%s\n", config.Container.Home) - } - if config.Container.Hostname != "" { - t.Printf(" Hostname:\t%s\n", config.Container.Hostname) - } flags := config.Container.Flags.String() // this is included in the upper hst.Config struct but is relevant here @@ -110,6 +104,12 @@ func printShowInstance( } t.Printf(" Flags:\t%s\n", flags) + if config.Container.Home != nil { + t.Printf(" Home:\t%s\n", config.Container.Home) + } + if config.Container.Hostname != "" { + t.Printf(" Hostname:\t%s\n", config.Container.Hostname) + } if config.Container.Path != nil { t.Printf(" Path:\t%s\n", config.Container.Path) } diff --git a/cmd/hakurei/print_test.go b/cmd/hakurei/print_test.go index 41d9cca..1d6f511 100644 --- a/cmd/hakurei/print_test.go +++ b/cmd/hakurei/print_test.go @@ -64,9 +64,9 @@ func TestPrintShowInstance(t *testing.T) { Identity: 9 (org.chromium.Chromium) Enablements: wayland, dbus, pulseaudio Groups: video, dialout, plugdev + Flags: multiarch, compat, devel, userns, net, abstract, tty, mapuid, device, runtime, tmpdir Home: /data/data/org.chromium.Chromium Hostname: localhost - Flags: multiarch, compat, devel, userns, net, abstract, tty, mapuid, device, runtime, tmpdir Path: /run/current-system/sw/bin/chromium Arguments: chromium --ignore-gpu-blocklist --disable-smooth-scrolling --enable-features=UseOzonePlatform --ozone-platform=wayland @@ -161,9 +161,9 @@ App Identity: 9 (org.chromium.Chromium) Enablements: wayland, dbus, pulseaudio Groups: video, dialout, plugdev + Flags: multiarch, compat, devel, userns, net, abstract, tty, mapuid, device, runtime, tmpdir Home: /data/data/org.chromium.Chromium Hostname: localhost - Flags: multiarch, compat, devel, userns, net, abstract, tty, mapuid, device, runtime, tmpdir Path: /run/current-system/sw/bin/chromium Arguments: chromium --ignore-gpu-blocklist --disable-smooth-scrolling --enable-features=UseOzonePlatform --ozone-platform=wayland