From a91920310d20e1fc472dea044fce8fd9438835df Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sat, 15 Nov 2025 13:47:09 +0900 Subject: [PATCH] internal: relocate packages Signed-off-by: Ophestra --- cmd/hakurei/command.go | 2 +- internal/{system => }/acl/acl.go | 0 internal/{system => }/acl/acl_test.go | 2 +- internal/{system => }/acl/libacl-helper.c | 0 internal/{system => }/acl/libacl-helper.go | 0 internal/{system => }/acl/libacl-helper.h | 0 .../{system => }/acl/libacl-helper_test.go | 0 internal/{system => }/acl/perms.go | 0 internal/{system => }/acl/perms_test.go | 2 +- internal/{system => }/dbus/address.go | 0 .../{system => }/dbus/address_escape_test.go | 0 internal/{system => }/dbus/address_test.go | 2 +- internal/{system => }/dbus/config.go | 0 internal/{system => }/dbus/config_test.go | 2 +- internal/{system => }/dbus/dbus.go | 0 internal/{system => }/dbus/dbus_test.go | 2 +- internal/{system => }/dbus/export_test.go | 0 internal/{system => }/dbus/proc.go | 0 internal/{system => }/dbus/proc_test.go | 0 internal/{system => }/dbus/proxy.go | 0 internal/{system => }/dbus/samples_test.go | 0 .../dbus/testdata/dev.vencord.Vesktop.json | 0 .../dbus/testdata/org.chromium.Chromium+.json | 0 .../dbus/testdata/org.chromium.Chromium.json | 0 .../testdata/uk.gensokyo.CrashTestDummy.json | 0 internal/outcome/dispatcher.go | 2 +- internal/outcome/outcome.go | 2 +- internal/outcome/run_test.go | 4 ++-- internal/outcome/spcontainer.go | 4 ++-- internal/outcome/spcontainer_test.go | 4 ++-- internal/outcome/spdbus.go | 4 ++-- internal/outcome/spdbus_test.go | 4 ++-- internal/outcome/sppulse_test.go | 2 +- internal/outcome/spruntime.go | 2 +- internal/outcome/spruntime_test.go | 2 +- internal/outcome/sptmpdir.go | 2 +- internal/outcome/sptmpdir_test.go | 2 +- internal/outcome/spwayland.go | 4 ++-- internal/outcome/spwayland_test.go | 4 ++-- internal/outcome/spx11.go | 2 +- internal/outcome/spx11_test.go | 2 +- internal/system/acl.go | 2 +- internal/system/acl_test.go | 2 +- internal/system/dbus.go | 2 +- internal/system/dbus_test.go | 2 +- internal/system/dispatcher.go | 6 +++--- internal/system/dispatcher_test.go | 6 +++--- internal/system/system_test.go | 2 +- internal/system/wayland.go | 4 ++-- internal/system/wayland_test.go | 4 ++-- internal/system/xhost.go | 2 +- internal/system/xhost_test.go | 2 +- internal/{system => }/wayland/conn.go | 0 .../wayland/security-context-v1-protocol.c | 0 .../wayland/security-context-v1-protocol.h | 0 .../wayland/wayland-client-helper.c | 0 .../wayland/wayland-client-helper.h | 0 internal/{system => }/wayland/wayland.go | 0 internal/{system => }/xcb/changehosts.go | 0 internal/{system => }/xcb/xcb.go | 0 system/acl/deprecated.go | 6 +++--- system/dbus/deprecated.go | 20 +++++++++---------- system/wayland/deprecated.go | 4 ++-- 63 files changed, 61 insertions(+), 61 deletions(-) rename internal/{system => }/acl/acl.go (100%) rename internal/{system => }/acl/acl_test.go (99%) rename internal/{system => }/acl/libacl-helper.c (100%) rename internal/{system => }/acl/libacl-helper.go (100%) rename internal/{system => }/acl/libacl-helper.h (100%) rename internal/{system => }/acl/libacl-helper_test.go (100%) rename internal/{system => }/acl/perms.go (100%) rename internal/{system => }/acl/perms_test.go (95%) rename internal/{system => }/dbus/address.go (100%) rename internal/{system => }/dbus/address_escape_test.go (100%) rename internal/{system => }/dbus/address_test.go (98%) rename internal/{system => }/dbus/config.go (100%) rename internal/{system => }/dbus/config_test.go (98%) rename internal/{system => }/dbus/dbus.go (100%) rename internal/{system => }/dbus/dbus_test.go (99%) rename internal/{system => }/dbus/export_test.go (100%) rename internal/{system => }/dbus/proc.go (100%) rename internal/{system => }/dbus/proc_test.go (100%) rename internal/{system => }/dbus/proxy.go (100%) rename internal/{system => }/dbus/samples_test.go (100%) rename internal/{system => }/dbus/testdata/dev.vencord.Vesktop.json (100%) rename internal/{system => }/dbus/testdata/org.chromium.Chromium+.json (100%) rename internal/{system => }/dbus/testdata/org.chromium.Chromium.json (100%) rename internal/{system => }/dbus/testdata/uk.gensokyo.CrashTestDummy.json (100%) rename internal/{system => }/wayland/conn.go (100%) rename internal/{system => }/wayland/security-context-v1-protocol.c (100%) rename internal/{system => }/wayland/security-context-v1-protocol.h (100%) rename internal/{system => }/wayland/wayland-client-helper.c (100%) rename internal/{system => }/wayland/wayland-client-helper.h (100%) rename internal/{system => }/wayland/wayland.go (100%) rename internal/{system => }/xcb/changehosts.go (100%) rename internal/{system => }/xcb/xcb.go (100%) diff --git a/cmd/hakurei/command.go b/cmd/hakurei/command.go index 2b0568e..5d33d41 100644 --- a/cmd/hakurei/command.go +++ b/cmd/hakurei/command.go @@ -17,10 +17,10 @@ import ( "hakurei.app/container/check" "hakurei.app/container/fhs" "hakurei.app/hst" + "hakurei.app/internal/dbus" "hakurei.app/internal/env" "hakurei.app/internal/info" "hakurei.app/internal/outcome" - "hakurei.app/internal/system/dbus" "hakurei.app/message" ) diff --git a/internal/system/acl/acl.go b/internal/acl/acl.go similarity index 100% rename from internal/system/acl/acl.go rename to internal/acl/acl.go diff --git a/internal/system/acl/acl_test.go b/internal/acl/acl_test.go similarity index 99% rename from internal/system/acl/acl_test.go rename to internal/acl/acl_test.go index b0dd58d..5b1b30e 100644 --- a/internal/system/acl/acl_test.go +++ b/internal/acl/acl_test.go @@ -13,7 +13,7 @@ import ( "strconv" "testing" - "hakurei.app/internal/system/acl" + "hakurei.app/internal/acl" ) const testFileName = "acl.test" diff --git a/internal/system/acl/libacl-helper.c b/internal/acl/libacl-helper.c similarity index 100% rename from internal/system/acl/libacl-helper.c rename to internal/acl/libacl-helper.c diff --git a/internal/system/acl/libacl-helper.go b/internal/acl/libacl-helper.go similarity index 100% rename from internal/system/acl/libacl-helper.go rename to internal/acl/libacl-helper.go diff --git a/internal/system/acl/libacl-helper.h b/internal/acl/libacl-helper.h similarity index 100% rename from internal/system/acl/libacl-helper.h rename to internal/acl/libacl-helper.h diff --git a/internal/system/acl/libacl-helper_test.go b/internal/acl/libacl-helper_test.go similarity index 100% rename from internal/system/acl/libacl-helper_test.go rename to internal/acl/libacl-helper_test.go diff --git a/internal/system/acl/perms.go b/internal/acl/perms.go similarity index 100% rename from internal/system/acl/perms.go rename to internal/acl/perms.go diff --git a/internal/system/acl/perms_test.go b/internal/acl/perms_test.go similarity index 95% rename from internal/system/acl/perms_test.go rename to internal/acl/perms_test.go index 3d5e3df..3920046 100644 --- a/internal/system/acl/perms_test.go +++ b/internal/acl/perms_test.go @@ -3,7 +3,7 @@ package acl_test import ( "testing" - "hakurei.app/internal/system/acl" + "hakurei.app/internal/acl" ) func TestPerms(t *testing.T) { diff --git a/internal/system/dbus/address.go b/internal/dbus/address.go similarity index 100% rename from internal/system/dbus/address.go rename to internal/dbus/address.go diff --git a/internal/system/dbus/address_escape_test.go b/internal/dbus/address_escape_test.go similarity index 100% rename from internal/system/dbus/address_escape_test.go rename to internal/dbus/address_escape_test.go diff --git a/internal/system/dbus/address_test.go b/internal/dbus/address_test.go similarity index 98% rename from internal/system/dbus/address_test.go rename to internal/dbus/address_test.go index 9ed4821..7517aa1 100644 --- a/internal/system/dbus/address_test.go +++ b/internal/dbus/address_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "hakurei.app/internal/system/dbus" + "hakurei.app/internal/dbus" ) func TestParse(t *testing.T) { diff --git a/internal/system/dbus/config.go b/internal/dbus/config.go similarity index 100% rename from internal/system/dbus/config.go rename to internal/dbus/config.go diff --git a/internal/system/dbus/config_test.go b/internal/dbus/config_test.go similarity index 98% rename from internal/system/dbus/config_test.go rename to internal/dbus/config_test.go index dec4cb1..8509007 100644 --- a/internal/system/dbus/config_test.go +++ b/internal/dbus/config_test.go @@ -7,7 +7,7 @@ import ( "testing" "hakurei.app/hst" - "hakurei.app/internal/system/dbus" + "hakurei.app/internal/dbus" ) func TestConfigArgs(t *testing.T) { diff --git a/internal/system/dbus/dbus.go b/internal/dbus/dbus.go similarity index 100% rename from internal/system/dbus/dbus.go rename to internal/dbus/dbus.go diff --git a/internal/system/dbus/dbus_test.go b/internal/dbus/dbus_test.go similarity index 99% rename from internal/system/dbus/dbus_test.go rename to internal/dbus/dbus_test.go index 9fc2b53..5d6e4c4 100644 --- a/internal/system/dbus/dbus_test.go +++ b/internal/dbus/dbus_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" + "hakurei.app/internal/dbus" "hakurei.app/internal/helper" - "hakurei.app/internal/system/dbus" "hakurei.app/message" ) diff --git a/internal/system/dbus/export_test.go b/internal/dbus/export_test.go similarity index 100% rename from internal/system/dbus/export_test.go rename to internal/dbus/export_test.go diff --git a/internal/system/dbus/proc.go b/internal/dbus/proc.go similarity index 100% rename from internal/system/dbus/proc.go rename to internal/dbus/proc.go diff --git a/internal/system/dbus/proc_test.go b/internal/dbus/proc_test.go similarity index 100% rename from internal/system/dbus/proc_test.go rename to internal/dbus/proc_test.go diff --git a/internal/system/dbus/proxy.go b/internal/dbus/proxy.go similarity index 100% rename from internal/system/dbus/proxy.go rename to internal/dbus/proxy.go diff --git a/internal/system/dbus/samples_test.go b/internal/dbus/samples_test.go similarity index 100% rename from internal/system/dbus/samples_test.go rename to internal/dbus/samples_test.go diff --git a/internal/system/dbus/testdata/dev.vencord.Vesktop.json b/internal/dbus/testdata/dev.vencord.Vesktop.json similarity index 100% rename from internal/system/dbus/testdata/dev.vencord.Vesktop.json rename to internal/dbus/testdata/dev.vencord.Vesktop.json diff --git a/internal/system/dbus/testdata/org.chromium.Chromium+.json b/internal/dbus/testdata/org.chromium.Chromium+.json similarity index 100% rename from internal/system/dbus/testdata/org.chromium.Chromium+.json rename to internal/dbus/testdata/org.chromium.Chromium+.json diff --git a/internal/system/dbus/testdata/org.chromium.Chromium.json b/internal/dbus/testdata/org.chromium.Chromium.json similarity index 100% rename from internal/system/dbus/testdata/org.chromium.Chromium.json rename to internal/dbus/testdata/org.chromium.Chromium.json diff --git a/internal/system/dbus/testdata/uk.gensokyo.CrashTestDummy.json b/internal/dbus/testdata/uk.gensokyo.CrashTestDummy.json similarity index 100% rename from internal/system/dbus/testdata/uk.gensokyo.CrashTestDummy.json rename to internal/dbus/testdata/uk.gensokyo.CrashTestDummy.json diff --git a/internal/outcome/dispatcher.go b/internal/outcome/dispatcher.go index 20c70a4..a5339b2 100644 --- a/internal/outcome/dispatcher.go +++ b/internal/outcome/dispatcher.go @@ -14,8 +14,8 @@ import ( "hakurei.app/container/check" "hakurei.app/container/seccomp" "hakurei.app/container/std" + "hakurei.app/internal/dbus" "hakurei.app/internal/info" - "hakurei.app/internal/system/dbus" "hakurei.app/message" ) diff --git a/internal/outcome/outcome.go b/internal/outcome/outcome.go index b137d4f..48f85a4 100644 --- a/internal/outcome/outcome.go +++ b/internal/outcome/outcome.go @@ -9,9 +9,9 @@ import ( "hakurei.app/container" "hakurei.app/container/check" "hakurei.app/hst" + "hakurei.app/internal/acl" "hakurei.app/internal/env" "hakurei.app/internal/system" - "hakurei.app/internal/system/acl" "hakurei.app/message" ) diff --git a/internal/outcome/run_test.go b/internal/outcome/run_test.go index de2113f..6908cd2 100644 --- a/internal/outcome/run_test.go +++ b/internal/outcome/run_test.go @@ -21,9 +21,9 @@ import ( "hakurei.app/container/seccomp" "hakurei.app/container/std" "hakurei.app/hst" + "hakurei.app/internal/acl" + "hakurei.app/internal/dbus" "hakurei.app/internal/system" - "hakurei.app/internal/system/acl" - "hakurei.app/internal/system/dbus" "hakurei.app/message" ) diff --git a/internal/outcome/spcontainer.go b/internal/outcome/spcontainer.go index 738d338..28697b4 100644 --- a/internal/outcome/spcontainer.go +++ b/internal/outcome/spcontainer.go @@ -16,9 +16,9 @@ import ( "hakurei.app/container/seccomp" "hakurei.app/container/std" "hakurei.app/hst" + "hakurei.app/internal/acl" + "hakurei.app/internal/dbus" "hakurei.app/internal/system" - "hakurei.app/internal/system/acl" - "hakurei.app/internal/system/dbus" "hakurei.app/internal/validate" "hakurei.app/message" ) diff --git a/internal/outcome/spcontainer_test.go b/internal/outcome/spcontainer_test.go index d6999b9..51a0402 100644 --- a/internal/outcome/spcontainer_test.go +++ b/internal/outcome/spcontainer_test.go @@ -14,9 +14,9 @@ import ( "hakurei.app/container/std" "hakurei.app/container/stub" "hakurei.app/hst" + "hakurei.app/internal/acl" + "hakurei.app/internal/dbus" "hakurei.app/internal/system" - "hakurei.app/internal/system/acl" - "hakurei.app/internal/system/dbus" ) func TestSpParamsOp(t *testing.T) { diff --git a/internal/outcome/spdbus.go b/internal/outcome/spdbus.go index c123135..8b3fbdb 100644 --- a/internal/outcome/spdbus.go +++ b/internal/outcome/spdbus.go @@ -5,8 +5,8 @@ import ( "hakurei.app/container/fhs" "hakurei.app/hst" - "hakurei.app/internal/system/acl" - "hakurei.app/internal/system/dbus" + "hakurei.app/internal/acl" + "hakurei.app/internal/dbus" ) func init() { gob.Register(new(spDBusOp)) } diff --git a/internal/outcome/spdbus_test.go b/internal/outcome/spdbus_test.go index 2e489c2..350fc32 100644 --- a/internal/outcome/spdbus_test.go +++ b/internal/outcome/spdbus_test.go @@ -7,10 +7,10 @@ import ( "hakurei.app/container" "hakurei.app/container/stub" "hakurei.app/hst" + "hakurei.app/internal/acl" + "hakurei.app/internal/dbus" "hakurei.app/internal/helper" "hakurei.app/internal/system" - "hakurei.app/internal/system/acl" - "hakurei.app/internal/system/dbus" "hakurei.app/message" ) diff --git a/internal/outcome/sppulse_test.go b/internal/outcome/sppulse_test.go index e988ec0..4ec445d 100644 --- a/internal/outcome/sppulse_test.go +++ b/internal/outcome/sppulse_test.go @@ -11,8 +11,8 @@ import ( "hakurei.app/container/check" "hakurei.app/container/stub" "hakurei.app/hst" + "hakurei.app/internal/acl" "hakurei.app/internal/system" - "hakurei.app/internal/system/acl" ) func TestSpPulseOp(t *testing.T) { diff --git a/internal/outcome/spruntime.go b/internal/outcome/spruntime.go index 34c1634..1e066bd 100644 --- a/internal/outcome/spruntime.go +++ b/internal/outcome/spruntime.go @@ -7,8 +7,8 @@ import ( "hakurei.app/container/fhs" "hakurei.app/container/std" "hakurei.app/hst" + "hakurei.app/internal/acl" "hakurei.app/internal/system" - "hakurei.app/internal/system/acl" ) const ( diff --git a/internal/outcome/spruntime_test.go b/internal/outcome/spruntime_test.go index b05cc1d..18f3ce9 100644 --- a/internal/outcome/spruntime_test.go +++ b/internal/outcome/spruntime_test.go @@ -8,8 +8,8 @@ import ( "hakurei.app/container/std" "hakurei.app/container/stub" "hakurei.app/hst" + "hakurei.app/internal/acl" "hakurei.app/internal/system" - "hakurei.app/internal/system/acl" ) func TestSpRuntimeOp(t *testing.T) { diff --git a/internal/outcome/sptmpdir.go b/internal/outcome/sptmpdir.go index dd675d6..9fb3f8d 100644 --- a/internal/outcome/sptmpdir.go +++ b/internal/outcome/sptmpdir.go @@ -7,8 +7,8 @@ import ( "hakurei.app/container/fhs" "hakurei.app/container/std" "hakurei.app/hst" + "hakurei.app/internal/acl" "hakurei.app/internal/system" - "hakurei.app/internal/system/acl" ) func init() { gob.Register(spTmpdirOp{}) } diff --git a/internal/outcome/sptmpdir_test.go b/internal/outcome/sptmpdir_test.go index ccc8f3d..61290c8 100644 --- a/internal/outcome/sptmpdir_test.go +++ b/internal/outcome/sptmpdir_test.go @@ -8,8 +8,8 @@ import ( "hakurei.app/container/std" "hakurei.app/container/stub" "hakurei.app/hst" + "hakurei.app/internal/acl" "hakurei.app/internal/system" - "hakurei.app/internal/system/acl" ) func TestSpTmpdirOp(t *testing.T) { diff --git a/internal/outcome/spwayland.go b/internal/outcome/spwayland.go index a57c3c0..7eccce2 100644 --- a/internal/outcome/spwayland.go +++ b/internal/outcome/spwayland.go @@ -5,8 +5,8 @@ import ( "hakurei.app/container/check" "hakurei.app/hst" - "hakurei.app/internal/system/acl" - "hakurei.app/internal/system/wayland" + "hakurei.app/internal/acl" + "hakurei.app/internal/wayland" ) func init() { gob.Register(new(spWaylandOp)) } diff --git a/internal/outcome/spwayland_test.go b/internal/outcome/spwayland_test.go index 3c99abd..828cc86 100644 --- a/internal/outcome/spwayland_test.go +++ b/internal/outcome/spwayland_test.go @@ -6,9 +6,9 @@ import ( "hakurei.app/container" "hakurei.app/container/stub" "hakurei.app/hst" + "hakurei.app/internal/acl" "hakurei.app/internal/system" - "hakurei.app/internal/system/acl" - "hakurei.app/internal/system/wayland" + "hakurei.app/internal/wayland" ) func TestSpWaylandOp(t *testing.T) { diff --git a/internal/outcome/spx11.go b/internal/outcome/spx11.go index 8fb7ab4..fd2b273 100644 --- a/internal/outcome/spx11.go +++ b/internal/outcome/spx11.go @@ -11,7 +11,7 @@ import ( "hakurei.app/container/check" "hakurei.app/container/fhs" "hakurei.app/hst" - "hakurei.app/internal/system/acl" + "hakurei.app/internal/acl" ) var absX11SocketDir = fhs.AbsTmp.Append(".X11-unix") diff --git a/internal/outcome/spx11_test.go b/internal/outcome/spx11_test.go index 794da6a..d4c1090 100644 --- a/internal/outcome/spx11_test.go +++ b/internal/outcome/spx11_test.go @@ -7,7 +7,7 @@ import ( "hakurei.app/container" "hakurei.app/container/stub" "hakurei.app/hst" - "hakurei.app/internal/system/acl" + "hakurei.app/internal/acl" ) func TestSpX11Op(t *testing.T) { diff --git a/internal/system/acl.go b/internal/system/acl.go index 854e812..060d885 100644 --- a/internal/system/acl.go +++ b/internal/system/acl.go @@ -8,7 +8,7 @@ import ( "hakurei.app/container/check" "hakurei.app/hst" - "hakurei.app/internal/system/acl" + "hakurei.app/internal/acl" ) // UpdatePerm calls UpdatePermType with the [Process] criteria. diff --git a/internal/system/acl_test.go b/internal/system/acl_test.go index 1fc3b1a..f7829e2 100644 --- a/internal/system/acl_test.go +++ b/internal/system/acl_test.go @@ -7,7 +7,7 @@ import ( "hakurei.app/container/stub" "hakurei.app/hst" - "hakurei.app/internal/system/acl" + "hakurei.app/internal/acl" ) func TestACLUpdateOp(t *testing.T) { diff --git a/internal/system/dbus.go b/internal/system/dbus.go index b9021b8..8e2a7ec 100644 --- a/internal/system/dbus.go +++ b/internal/system/dbus.go @@ -13,7 +13,7 @@ import ( "hakurei.app/container" "hakurei.app/hst" - "hakurei.app/internal/system/dbus" + "hakurei.app/internal/dbus" ) // ErrDBusConfig is returned when a required [hst.BusConfig] argument is nil. diff --git a/internal/system/dbus_test.go b/internal/system/dbus_test.go index f79c848..10d242c 100644 --- a/internal/system/dbus_test.go +++ b/internal/system/dbus_test.go @@ -11,8 +11,8 @@ import ( "hakurei.app/container/stub" "hakurei.app/hst" + "hakurei.app/internal/dbus" "hakurei.app/internal/helper" - "hakurei.app/internal/system/dbus" ) func TestDBusProxyOp(t *testing.T) { diff --git a/internal/system/dispatcher.go b/internal/system/dispatcher.go index 86aebca..1ea9f10 100644 --- a/internal/system/dispatcher.go +++ b/internal/system/dispatcher.go @@ -7,9 +7,9 @@ import ( "os" "hakurei.app/hst" - "hakurei.app/internal/system/acl" - "hakurei.app/internal/system/dbus" - "hakurei.app/internal/system/xcb" + "hakurei.app/internal/acl" + "hakurei.app/internal/dbus" + "hakurei.app/internal/xcb" ) type osFile interface { diff --git a/internal/system/dispatcher_test.go b/internal/system/dispatcher_test.go index 8000f0c..95aab3e 100644 --- a/internal/system/dispatcher_test.go +++ b/internal/system/dispatcher_test.go @@ -10,9 +10,9 @@ import ( "hakurei.app/container/stub" "hakurei.app/hst" - "hakurei.app/internal/system/acl" - "hakurei.app/internal/system/dbus" - "hakurei.app/internal/system/xcb" + "hakurei.app/internal/acl" + "hakurei.app/internal/dbus" + "hakurei.app/internal/xcb" ) // call initialises a [stub.Call]. diff --git a/internal/system/system_test.go b/internal/system/system_test.go index b0773b0..f36ff54 100644 --- a/internal/system/system_test.go +++ b/internal/system/system_test.go @@ -11,7 +11,7 @@ import ( "hakurei.app/container/check" "hakurei.app/container/stub" "hakurei.app/hst" - "hakurei.app/internal/system/xcb" + "hakurei.app/internal/xcb" "hakurei.app/message" ) diff --git a/internal/system/wayland.go b/internal/system/wayland.go index 8883148..c423fe2 100644 --- a/internal/system/wayland.go +++ b/internal/system/wayland.go @@ -7,8 +7,8 @@ import ( "hakurei.app/container/check" "hakurei.app/hst" - "hakurei.app/internal/system/acl" - "hakurei.app/internal/system/wayland" + "hakurei.app/internal/acl" + "hakurei.app/internal/wayland" ) type waylandConn interface { diff --git a/internal/system/wayland_test.go b/internal/system/wayland_test.go index 083c8ba..4e7db51 100644 --- a/internal/system/wayland_test.go +++ b/internal/system/wayland_test.go @@ -6,8 +6,8 @@ import ( "testing" "hakurei.app/container/stub" - "hakurei.app/internal/system/acl" - "hakurei.app/internal/system/wayland" + "hakurei.app/internal/acl" + "hakurei.app/internal/wayland" ) type stubWaylandConn struct { diff --git a/internal/system/xhost.go b/internal/system/xhost.go index 27e60c2..be44ce1 100644 --- a/internal/system/xhost.go +++ b/internal/system/xhost.go @@ -2,7 +2,7 @@ package system import ( "hakurei.app/hst" - "hakurei.app/internal/system/xcb" + "hakurei.app/internal/xcb" ) // ChangeHosts inserts the target user into X11 hosts and deletes it once its [Enablement] is no longer satisfied. diff --git a/internal/system/xhost_test.go b/internal/system/xhost_test.go index 853da65..75ad5b9 100644 --- a/internal/system/xhost_test.go +++ b/internal/system/xhost_test.go @@ -5,7 +5,7 @@ import ( "hakurei.app/container/stub" "hakurei.app/hst" - "hakurei.app/internal/system/xcb" + "hakurei.app/internal/xcb" ) func TestXHostOp(t *testing.T) { diff --git a/internal/system/wayland/conn.go b/internal/wayland/conn.go similarity index 100% rename from internal/system/wayland/conn.go rename to internal/wayland/conn.go diff --git a/internal/system/wayland/security-context-v1-protocol.c b/internal/wayland/security-context-v1-protocol.c similarity index 100% rename from internal/system/wayland/security-context-v1-protocol.c rename to internal/wayland/security-context-v1-protocol.c diff --git a/internal/system/wayland/security-context-v1-protocol.h b/internal/wayland/security-context-v1-protocol.h similarity index 100% rename from internal/system/wayland/security-context-v1-protocol.h rename to internal/wayland/security-context-v1-protocol.h diff --git a/internal/system/wayland/wayland-client-helper.c b/internal/wayland/wayland-client-helper.c similarity index 100% rename from internal/system/wayland/wayland-client-helper.c rename to internal/wayland/wayland-client-helper.c diff --git a/internal/system/wayland/wayland-client-helper.h b/internal/wayland/wayland-client-helper.h similarity index 100% rename from internal/system/wayland/wayland-client-helper.h rename to internal/wayland/wayland-client-helper.h diff --git a/internal/system/wayland/wayland.go b/internal/wayland/wayland.go similarity index 100% rename from internal/system/wayland/wayland.go rename to internal/wayland/wayland.go diff --git a/internal/system/xcb/changehosts.go b/internal/xcb/changehosts.go similarity index 100% rename from internal/system/xcb/changehosts.go rename to internal/xcb/changehosts.go diff --git a/internal/system/xcb/xcb.go b/internal/xcb/xcb.go similarity index 100% rename from internal/system/xcb/xcb.go rename to internal/xcb/xcb.go diff --git a/system/acl/deprecated.go b/system/acl/deprecated.go index 4119057..1981eb7 100644 --- a/system/acl/deprecated.go +++ b/system/acl/deprecated.go @@ -1,4 +1,4 @@ -// Package acl exposes the internal/system/acl package. +// Package acl exposes the internal/acl package. // // Deprecated: This package will be removed in 0.4. package acl @@ -6,7 +6,7 @@ package acl import ( _ "unsafe" // for go:linkname - "hakurei.app/internal/system/acl" + "hakurei.app/internal/acl" ) type Perm = acl.Perm @@ -19,7 +19,7 @@ const ( // Update replaces ACL_USER entry with qualifier uid. // -//go:linkname Update hakurei.app/internal/system/acl.Update +//go:linkname Update hakurei.app/internal/acl.Update func Update(name string, uid int, perms ...Perm) error type Perms = acl.Perms diff --git a/system/dbus/deprecated.go b/system/dbus/deprecated.go index 67a309c..8f8a669 100644 --- a/system/dbus/deprecated.go +++ b/system/dbus/deprecated.go @@ -1,4 +1,4 @@ -// Package dbus exposes the internal/system/dbus package. +// Package dbus exposes the internal/dbus package. // // Deprecated: This package will be removed in 0.4. package dbus @@ -9,7 +9,7 @@ import ( _ "unsafe" // for go:linkname "hakurei.app/hst" - "hakurei.app/internal/system/dbus" + "hakurei.app/internal/dbus" "hakurei.app/message" ) @@ -17,13 +17,13 @@ type AddrEntry = dbus.AddrEntry // EqualAddrEntries returns whether two slices of [AddrEntry] are equal. // -//go:linkname EqualAddrEntries hakurei.app/internal/system/dbus.EqualAddrEntries +//go:linkname EqualAddrEntries hakurei.app/internal/dbus.EqualAddrEntries func EqualAddrEntries(entries, target []AddrEntry) bool // Parse parses D-Bus address according to // https://dbus.freedesktop.org/doc/dbus-specification.html#addresses // -//go:linkname Parse hakurei.app/internal/system/dbus.Parse +//go:linkname Parse hakurei.app/internal/dbus.Parse func Parse(addr []byte) ([]AddrEntry, error) type ParseError = dbus.ParseError @@ -46,12 +46,12 @@ type ProxyPair = dbus.ProxyPair // Args returns the xdg-dbus-proxy arguments equivalent of [hst.BusConfig]. // -//go:linkname Args hakurei.app/internal/system/dbus.Args +//go:linkname Args hakurei.app/internal/dbus.Args func Args(c *hst.BusConfig, bus ProxyPair) (args []string) // NewConfig returns the address of a new [hst.BusConfig] with optional defaults. // -//go:linkname NewConfig hakurei.app/internal/system/dbus.NewConfig +//go:linkname NewConfig hakurei.app/internal/dbus.NewConfig func NewConfig(id string, defaults, mpris bool) *hst.BusConfig const ( @@ -89,13 +89,13 @@ const ( // Address returns the session and system bus addresses copied from environment, // or appropriate fallback values if they are not set. // -//go:linkname Address hakurei.app/internal/system/dbus.Address +//go:linkname Address hakurei.app/internal/dbus.Address func Address() (session, system string) // ProxyName is the file name or path to the proxy program. // Overriding ProxyName will only affect Proxy instance created after the change. // -//go:linkname ProxyName hakurei.app/internal/system/dbus.ProxyName +//go:linkname ProxyName hakurei.app/internal/dbus.ProxyName var ProxyName string // Proxy holds the state of a xdg-dbus-proxy process, and should never be copied. @@ -106,10 +106,10 @@ type Final = dbus.Final // Finalise creates a checked argument writer for [Proxy]. // -//go:linkname Finalise hakurei.app/internal/system/dbus.Finalise +//go:linkname Finalise hakurei.app/internal/dbus.Finalise func Finalise(sessionBus, systemBus ProxyPair, session, system *hst.BusConfig) (final *Final, err error) // New returns a new instance of [Proxy]. // -//go:linkname New hakurei.app/internal/system/dbus.New +//go:linkname New hakurei.app/internal/dbus.New func New(ctx context.Context, msg message.Msg, final *Final, output io.Writer) *Proxy diff --git a/system/wayland/deprecated.go b/system/wayland/deprecated.go index bf364d9..e83c910 100644 --- a/system/wayland/deprecated.go +++ b/system/wayland/deprecated.go @@ -1,4 +1,4 @@ -// Package wayland exposes the internal/system/wayland package. +// Package wayland exposes the internal/wayland package. // // Deprecated: This package will be removed in 0.4. package wayland @@ -6,7 +6,7 @@ package wayland import ( _ "unsafe" // for go:linkname - "hakurei.app/internal/system/wayland" + "hakurei.app/internal/wayland" ) // Conn represents a connection to the wayland display server.