From 03c24c51224e85eb96527a512f5f0483464fc810 Mon Sep 17 00:00:00 2001 From: Ophestra Umiker Date: Mon, 16 Sep 2024 20:32:07 +0900 Subject: [PATCH] move acl and xcb binding packages to top level These packages are reasonably clean and do not interact with other packages. Signed-off-by: Ophestra Umiker --- {internal/acl => acl}/c.go | 0 {internal/acl => acl}/export.go | 0 internal/app/dbus.go | 4 ++-- internal/app/ensure.go | 7 ++++--- internal/app/pulse.go | 4 ++-- internal/app/wayland.go | 4 ++-- internal/app/x.go | 4 ++-- internal/final/exit.go | 9 +++++---- {internal/xcb => xcb}/c.go | 0 {internal/xcb => xcb}/export.go | 0 10 files changed, 17 insertions(+), 15 deletions(-) rename {internal/acl => acl}/c.go (100%) rename {internal/acl => acl}/export.go (100%) rename {internal/xcb => xcb}/c.go (100%) rename {internal/xcb => xcb}/export.go (100%) diff --git a/internal/acl/c.go b/acl/c.go similarity index 100% rename from internal/acl/c.go rename to acl/c.go diff --git a/internal/acl/export.go b/acl/export.go similarity index 100% rename from internal/acl/export.go rename to acl/export.go diff --git a/internal/app/dbus.go b/internal/app/dbus.go index 06523e8..a327e2c 100644 --- a/internal/app/dbus.go +++ b/internal/app/dbus.go @@ -3,13 +3,13 @@ package app import ( "errors" "fmt" - "git.ophivana.moe/cat/fortify/internal/final" "os" "path" "strconv" + "git.ophivana.moe/cat/fortify/acl" "git.ophivana.moe/cat/fortify/dbus" - "git.ophivana.moe/cat/fortify/internal/acl" + "git.ophivana.moe/cat/fortify/internal/final" "git.ophivana.moe/cat/fortify/internal/state" "git.ophivana.moe/cat/fortify/internal/util" "git.ophivana.moe/cat/fortify/internal/verbose" diff --git a/internal/app/ensure.go b/internal/app/ensure.go index 9ab63ff..ada6349 100644 --- a/internal/app/ensure.go +++ b/internal/app/ensure.go @@ -3,12 +3,13 @@ package app import ( "errors" "fmt" - "git.ophivana.moe/cat/fortify/internal/acl" - "git.ophivana.moe/cat/fortify/internal/final" - "git.ophivana.moe/cat/fortify/internal/verbose" "io/fs" "os" "path" + + "git.ophivana.moe/cat/fortify/acl" + "git.ophivana.moe/cat/fortify/internal/final" + "git.ophivana.moe/cat/fortify/internal/verbose" ) func (a *App) EnsureRunDir() { diff --git a/internal/app/pulse.go b/internal/app/pulse.go index 4b67ff2..7c36025 100644 --- a/internal/app/pulse.go +++ b/internal/app/pulse.go @@ -3,12 +3,12 @@ package app import ( "errors" "fmt" - "git.ophivana.moe/cat/fortify/internal/final" "io/fs" "os" "path" - "git.ophivana.moe/cat/fortify/internal/acl" + "git.ophivana.moe/cat/fortify/acl" + "git.ophivana.moe/cat/fortify/internal/final" "git.ophivana.moe/cat/fortify/internal/state" "git.ophivana.moe/cat/fortify/internal/util" "git.ophivana.moe/cat/fortify/internal/verbose" diff --git a/internal/app/wayland.go b/internal/app/wayland.go index 9834fea..3b12e3e 100644 --- a/internal/app/wayland.go +++ b/internal/app/wayland.go @@ -2,11 +2,11 @@ package app import ( "fmt" - "git.ophivana.moe/cat/fortify/internal/final" "os" "path" - "git.ophivana.moe/cat/fortify/internal/acl" + "git.ophivana.moe/cat/fortify/acl" + "git.ophivana.moe/cat/fortify/internal/final" "git.ophivana.moe/cat/fortify/internal/state" "git.ophivana.moe/cat/fortify/internal/verbose" ) diff --git a/internal/app/x.go b/internal/app/x.go index 0703402..f198fee 100644 --- a/internal/app/x.go +++ b/internal/app/x.go @@ -2,12 +2,12 @@ package app import ( "fmt" - "git.ophivana.moe/cat/fortify/internal/final" "os" + "git.ophivana.moe/cat/fortify/internal/final" "git.ophivana.moe/cat/fortify/internal/state" "git.ophivana.moe/cat/fortify/internal/verbose" - "git.ophivana.moe/cat/fortify/internal/xcb" + "git.ophivana.moe/cat/fortify/xcb" ) const display = "DISPLAY" diff --git a/internal/final/exit.go b/internal/final/exit.go index 86cc2e7..063d8d0 100644 --- a/internal/final/exit.go +++ b/internal/final/exit.go @@ -3,12 +3,13 @@ package final import ( "errors" "fmt" - "git.ophivana.moe/cat/fortify/internal/acl" - "git.ophivana.moe/cat/fortify/internal/state" - "git.ophivana.moe/cat/fortify/internal/verbose" - "git.ophivana.moe/cat/fortify/internal/xcb" "io/fs" "os" + + "git.ophivana.moe/cat/fortify/acl" + "git.ophivana.moe/cat/fortify/internal/state" + "git.ophivana.moe/cat/fortify/internal/verbose" + "git.ophivana.moe/cat/fortify/xcb" ) func Fatal(msg ...any) { diff --git a/internal/xcb/c.go b/xcb/c.go similarity index 100% rename from internal/xcb/c.go rename to xcb/c.go diff --git a/internal/xcb/export.go b/xcb/export.go similarity index 100% rename from internal/xcb/export.go rename to xcb/export.go