Refactor package locations

Signed-off-by: Paulo Gomes <pjbgf@linux.com>
qubesome · Jul 15, 2024 · 5a7bc00 · 5a7bc00
1 parent d0e20fb
commit 5a7bc00
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 10 deletions.
diff --git a/internal/inception/inception.go b/internal/inception/inception.go
@@ -7,9 +7,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/qubesome/cli/internal/dbus"
 	"github.com/qubesome/cli/internal/files"
 	"github.com/qubesome/cli/internal/types"
+	"github.com/qubesome/cli/internal/util/dbus"
 )
 
 var (

diff --git a/internal/profiles/profiles.go b/internal/profiles/profiles.go
@@ -16,17 +16,17 @@ import (
 	"github.com/go-git/go-git/v5/plumbing/transport/ssh"
 	"github.com/google/uuid"
 	"github.com/qubesome/cli/internal/command"
-	"github.com/qubesome/cli/internal/dbus"
 	"github.com/qubesome/cli/internal/drive"
 	"github.com/qubesome/cli/internal/env"
 	"github.com/qubesome/cli/internal/files"
-	"github.com/qubesome/cli/internal/gpu"
 	"github.com/qubesome/cli/internal/images"
 	"github.com/qubesome/cli/internal/inception"
-	"github.com/qubesome/cli/internal/resolution"
 	"github.com/qubesome/cli/internal/socket"
 	"github.com/qubesome/cli/internal/types"
-	"github.com/qubesome/cli/internal/xauth"
+	"github.com/qubesome/cli/internal/util/dbus"
+	"github.com/qubesome/cli/internal/util/gpu"
+	"github.com/qubesome/cli/internal/util/resolution"
+	"github.com/qubesome/cli/internal/util/xauth"
 	"golang.org/x/sys/execabs"
 )
 

diff --git a/internal/qubesome/run.go b/internal/qubesome/run.go
@@ -11,15 +11,15 @@ import (
 
 	securejoin "github.com/cyphar/filepath-securejoin"
 	"github.com/qubesome/cli/internal/command"
-	"github.com/qubesome/cli/internal/dbus"
-	"github.com/qubesome/cli/internal/docker"
 	"github.com/qubesome/cli/internal/drive"
 	"github.com/qubesome/cli/internal/env"
 	"github.com/qubesome/cli/internal/files"
-	"github.com/qubesome/cli/internal/firecracker"
 	"github.com/qubesome/cli/internal/images"
 	"github.com/qubesome/cli/internal/inception"
+	"github.com/qubesome/cli/internal/runners/docker"
+	"github.com/qubesome/cli/internal/runners/firecracker"
 	"github.com/qubesome/cli/internal/types"
+	"github.com/qubesome/cli/internal/util/dbus"
 	"gopkg.in/yaml.v3"
 )
 

diff --git a/internal/docker/devices.go → internal/runners/docker/devices.go b/internal/docker/devices.go → internal/runners/docker/devices.go
diff --git a/internal/docker/run.go → internal/runners/docker/run.go b/internal/docker/run.go → internal/runners/docker/run.go
@@ -8,11 +8,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/qubesome/cli/internal/dbus"
 	"github.com/qubesome/cli/internal/env"
 	"github.com/qubesome/cli/internal/files"
-	"github.com/qubesome/cli/internal/gpu"
 	"github.com/qubesome/cli/internal/types"
+	"github.com/qubesome/cli/internal/util/dbus"
+	"github.com/qubesome/cli/internal/util/gpu"
 	"golang.org/x/sys/execabs"
 )
 

diff --git a/internal/firecracker/deps.go → internal/runners/firecracker/deps.go b/internal/firecracker/deps.go → internal/runners/firecracker/deps.go
diff --git a/internal/firecracker/run.go → internal/runners/firecracker/run.go b/internal/firecracker/run.go → internal/runners/firecracker/run.go
diff --git a/internal/firecracker/template.go → internal/runners/firecracker/template.go b/internal/firecracker/template.go → internal/runners/firecracker/template.go
diff --git a/internal/dbus/dbus.go → internal/util/dbus/dbus.go b/internal/dbus/dbus.go → internal/util/dbus/dbus.go
diff --git a/internal/gpu/gpu.go → internal/util/gpu/gpu.go b/internal/gpu/gpu.go → internal/util/gpu/gpu.go
diff --git a/internal/resolution/resolution.go → internal/util/resolution/resolution.go b/internal/resolution/resolution.go → internal/util/resolution/resolution.go
diff --git a/internal/resolution/resolution_x11.go → internal/util/resolution/resolution_x11.go b/internal/resolution/resolution_x11.go → internal/util/resolution/resolution_x11.go
diff --git a/internal/xauth/xauth.go → internal/util/xauth/xauth.go b/internal/xauth/xauth.go → internal/util/xauth/xauth.go
diff --git a/internal/xauth/xauth_test.go → internal/util/xauth/xauth_test.go b/internal/xauth/xauth_test.go → internal/util/xauth/xauth_test.go