diff --git a/cmd/fpkg/bundle.go b/cmd/fpkg/bundle.go index 5692d5c..d164116 100644 --- a/cmd/fpkg/bundle.go +++ b/cmd/fpkg/bundle.go @@ -6,7 +6,7 @@ import ( "os" "git.gensokyo.uk/security/fortify/dbus" - "git.gensokyo.uk/security/fortify/internal/system" + "git.gensokyo.uk/security/fortify/system" ) type bundleInfo struct { diff --git a/fst/config.go b/fst/config.go index 9a03e49..8910779 100644 --- a/fst/config.go +++ b/fst/config.go @@ -3,7 +3,7 @@ package fst import ( "git.gensokyo.uk/security/fortify/dbus" "git.gensokyo.uk/security/fortify/helper/bwrap" - "git.gensokyo.uk/security/fortify/internal/system" + "git.gensokyo.uk/security/fortify/system" ) const Tmp = "/.fortify" diff --git a/internal/app/app_nixos_test.go b/internal/app/app_nixos_test.go index 8923e9b..02d9aa2 100644 --- a/internal/app/app_nixos_test.go +++ b/internal/app/app_nixos_test.go @@ -5,7 +5,7 @@ import ( "git.gensokyo.uk/security/fortify/dbus" "git.gensokyo.uk/security/fortify/fst" "git.gensokyo.uk/security/fortify/helper/bwrap" - "git.gensokyo.uk/security/fortify/internal/system" + "git.gensokyo.uk/security/fortify/system" ) var testCasesNixos = []sealTestCase{ diff --git a/internal/app/app_pd_test.go b/internal/app/app_pd_test.go index b5cf46b..fb74ae1 100644 --- a/internal/app/app_pd_test.go +++ b/internal/app/app_pd_test.go @@ -7,7 +7,7 @@ import ( "git.gensokyo.uk/security/fortify/dbus" "git.gensokyo.uk/security/fortify/fst" "git.gensokyo.uk/security/fortify/helper/bwrap" - "git.gensokyo.uk/security/fortify/internal/system" + "git.gensokyo.uk/security/fortify/system" ) var testCasesPd = []sealTestCase{ diff --git a/internal/app/app_test.go b/internal/app/app_test.go index 25691ff..4640944 100644 --- a/internal/app/app_test.go +++ b/internal/app/app_test.go @@ -11,7 +11,7 @@ import ( "git.gensokyo.uk/security/fortify/helper/bwrap" "git.gensokyo.uk/security/fortify/internal/app" "git.gensokyo.uk/security/fortify/internal/linux" - "git.gensokyo.uk/security/fortify/internal/system" + "git.gensokyo.uk/security/fortify/system" ) type sealTestCase struct { diff --git a/internal/app/export_test.go b/internal/app/export_test.go index b796519..8581d1c 100644 --- a/internal/app/export_test.go +++ b/internal/app/export_test.go @@ -4,7 +4,7 @@ import ( "git.gensokyo.uk/security/fortify/fst" "git.gensokyo.uk/security/fortify/helper/bwrap" "git.gensokyo.uk/security/fortify/internal/linux" - "git.gensokyo.uk/security/fortify/internal/system" + "git.gensokyo.uk/security/fortify/system" ) func NewWithID(id fst.ID, os linux.System) App { diff --git a/internal/app/seal.go b/internal/app/seal.go index 4cd3129..6ad7edb 100644 --- a/internal/app/seal.go +++ b/internal/app/seal.go @@ -19,7 +19,7 @@ import ( "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" + "git.gensokyo.uk/security/fortify/system" ) var ( diff --git a/internal/app/share.go b/internal/app/share.go index beed4f0..f3c6b5b 100644 --- a/internal/app/share.go +++ b/internal/app/share.go @@ -12,7 +12,7 @@ import ( "git.gensokyo.uk/security/fortify/fst" "git.gensokyo.uk/security/fortify/internal/fmsg" "git.gensokyo.uk/security/fortify/internal/linux" - "git.gensokyo.uk/security/fortify/internal/system" + "git.gensokyo.uk/security/fortify/system" "git.gensokyo.uk/security/fortify/wl" ) diff --git a/internal/app/start.go b/internal/app/start.go index 8390b6b..33eaf86 100644 --- a/internal/app/start.go +++ b/internal/app/start.go @@ -14,7 +14,7 @@ import ( "git.gensokyo.uk/security/fortify/internal/app/shim" "git.gensokyo.uk/security/fortify/internal/fmsg" "git.gensokyo.uk/security/fortify/internal/state" - "git.gensokyo.uk/security/fortify/internal/system" + "git.gensokyo.uk/security/fortify/system" ) const shimSetupTimeout = 5 * time.Second diff --git a/internal/app/system.go b/internal/app/system.go index f11efc8..ccc5293 100644 --- a/internal/app/system.go +++ b/internal/app/system.go @@ -4,7 +4,7 @@ import ( "os" "git.gensokyo.uk/security/fortify/helper/bwrap" - "git.gensokyo.uk/security/fortify/internal/system" + "git.gensokyo.uk/security/fortify/system" ) // appSealSys encapsulates app seal behaviour with OS interactions diff --git a/main.go b/main.go index 9883afc..ca3b918 100644 --- a/main.go +++ b/main.go @@ -26,7 +26,7 @@ import ( "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" + "git.gensokyo.uk/security/fortify/system" ) var ( diff --git a/internal/system/acl.go b/system/acl.go similarity index 100% rename from internal/system/acl.go rename to system/acl.go diff --git a/internal/system/acl_test.go b/system/acl_test.go similarity index 100% rename from internal/system/acl_test.go rename to system/acl_test.go diff --git a/internal/system/dbus.go b/system/dbus.go similarity index 100% rename from internal/system/dbus.go rename to system/dbus.go diff --git a/internal/system/enablement.go b/system/enablement.go similarity index 100% rename from internal/system/enablement.go rename to system/enablement.go diff --git a/internal/system/link.go b/system/link.go similarity index 100% rename from internal/system/link.go rename to system/link.go diff --git a/internal/system/mkdir.go b/system/mkdir.go similarity index 100% rename from internal/system/mkdir.go rename to system/mkdir.go diff --git a/internal/system/mkdir_test.go b/system/mkdir_test.go similarity index 100% rename from internal/system/mkdir_test.go rename to system/mkdir_test.go diff --git a/internal/system/op.go b/system/op.go similarity index 100% rename from internal/system/op.go rename to system/op.go diff --git a/internal/system/op_internal_test.go b/system/op_internal_test.go similarity index 100% rename from internal/system/op_internal_test.go rename to system/op_internal_test.go diff --git a/internal/system/op_test.go b/system/op_test.go similarity index 97% rename from internal/system/op_test.go rename to system/op_test.go index 3e8c4d2..9d17969 100644 --- a/internal/system/op_test.go +++ b/system/op_test.go @@ -4,7 +4,7 @@ import ( "strconv" "testing" - "git.gensokyo.uk/security/fortify/internal/system" + "git.gensokyo.uk/security/fortify/system" ) func TestNew(t *testing.T) { diff --git a/internal/system/tmpfiles.go b/system/tmpfiles.go similarity index 100% rename from internal/system/tmpfiles.go rename to system/tmpfiles.go diff --git a/internal/system/tmpfiles_test.go b/system/tmpfiles_test.go similarity index 100% rename from internal/system/tmpfiles_test.go rename to system/tmpfiles_test.go diff --git a/internal/system/wayland.go b/system/wayland.go similarity index 100% rename from internal/system/wayland.go rename to system/wayland.go diff --git a/internal/system/xhost.go b/system/xhost.go similarity index 100% rename from internal/system/xhost.go rename to system/xhost.go diff --git a/internal/system/xhost_test.go b/system/xhost_test.go similarity index 100% rename from internal/system/xhost_test.go rename to system/xhost_test.go