From 56af312aad0c43d2b3d4e88d529f3b623928cefc Mon Sep 17 00:00:00 2001
From: despiegk <kristof@incubaid.com>
Date: Tue, 5 Aug 2025 16:04:55 +0200
Subject: [PATCH] ...

---
 Cargo.toml      | 37 ++++++++++++++++++++++++-------------
 rhai/Cargo.toml | 26 +++++++++++++-------------
 src/lib.rs      |  2 +-
 3 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0b9c8c1..8512fef 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -98,29 +98,40 @@ postgres-types = "0.2.5"
 r2d2 = "0.8.10"
 
 # SAL dependencies
+sal-git = { path = "packages/system/git" }
+sal-kubernetes = { path = "packages/system/kubernetes" }
+sal-redisclient = { path = "packages/clients/redisclient" }
+sal-mycelium = { path = "packages/clients/myceliumclient" }
 sal-text = { path = "packages/core/text" }
 sal-os = { path = "packages/system/os" }
+sal-net = { path = "packages/core/net" }
+sal-zinit-client = { path = "packages/clients/zinitclient" }
 sal-process = { path = "packages/system/process" }
 sal-virt = { path = "packages/system/virt" }
+sal-postgresclient = { path = "packages/clients/postgresclient" }
+sal-vault = { path = "packages/crypt/vault" }
+sal-rhai = { path = "rhai" }
+sal-service-manager = { path = "_archive/service_manager" }
 
 [dependencies]
 thiserror = { workspace = true }
 tokio = { workspace = true }
 
 # Optional dependencies - users can choose which modules to include
-sal-git = { path = "packages/system/git", optional = true }
-sal-kubernetes = { path = "packages/system/kubernetes", optional = true }
-sal-redisclient = { path = "packages/clients/redisclient", optional = true }
-sal-mycelium = { path = "packages/clients/myceliumclient", optional = true }
-sal-text = { path = "packages/core/text", optional = true }
-sal-os = { path = "packages/system/os", optional = true }
-sal-net = { path = "packages/core/net", optional = true }
-sal-zinit-client = { path = "packages/clients/zinitclient", optional = true }
-sal-process = { path = "packages/system/process", optional = true }
-sal-virt = { path = "packages/system/virt", optional = true }
-sal-postgresclient = { path = "packages/clients/postgresclient", optional = true }
-sal-vault = { path = "packages/crypt/vault", optional = true }
-sal-rhai = { path = "rhai", optional = true }
+sal-git = { workspace = true, optional = true }
+sal-kubernetes = { workspace = true, optional = true }
+sal-redisclient = { workspace = true, optional = true }
+sal-mycelium = { workspace = true, optional = true }
+sal-text = { workspace = true, optional = true }
+sal-os = { workspace = true, optional = true }
+sal-net = { workspace = true, optional = true }
+sal-zinit-client = { workspace = true, optional = true }
+sal-process = { workspace = true, optional = true }
+sal-virt = { workspace = true, optional = true }
+sal-postgresclient = { workspace = true, optional = true }
+sal-vault = { workspace = true, optional = true }
+sal-rhai = { workspace = true, optional = true }
+sal-service-manager = { workspace = true, optional = true }
 
 [features]
 default = []
diff --git a/rhai/Cargo.toml b/rhai/Cargo.toml
index 3f51844..3182714 100644
--- a/rhai/Cargo.toml
+++ b/rhai/Cargo.toml
@@ -18,19 +18,19 @@ thiserror = { workspace = true }
 uuid = { workspace = true }
 
 # All SAL packages that this aggregation package depends on
-sal-os = { path = "../os" }
-sal-process = { path = "../process" }
-sal-git = { path = "../system/git" }
-sal-vault = { path = "../vault" }
-sal-redisclient = { path = "../redisclient" }
-sal-postgresclient = { path = "../postgresclient" }
-sal-virt = { path = "../virt" }
-sal-mycelium = { path = "../mycelium" }
-sal-text = { path = "../text" }
-sal-net = { path = "../net" }
-sal-zinit-client = { path = "../zinit_client" }
-sal-kubernetes = { path = "../kubernetes" }
-sal-service-manager = { path = "../service_manager", features = ["rhai"] }
+sal-os = { workspace = true }
+sal-process = { workspace = true }
+sal-git = { workspace = true }
+sal-vault = { workspace = true }
+sal-redisclient = { workspace = true }
+sal-postgresclient = { workspace = true }
+sal-virt = { workspace = true }
+sal-mycelium = { workspace = true }
+sal-text = { workspace = true }
+sal-net = { workspace = true }
+sal-zinit-client = { workspace = true }
+sal-kubernetes = { workspace = true }
+sal-service-manager = { workspace = true, features = ["rhai"] }
 
 
 [features]
diff --git a/src/lib.rs b/src/lib.rs
index 74e3dc1..7ae9fdb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -64,7 +64,7 @@ pub use sal_redisclient as redisclient;
 #[cfg(feature = "rhai")]
 pub use sal_rhai as rhai;
 
-#[cfg(feature = "service_manager")]
+#[cfg(feature = "sal-service-manager")]
 pub use sal_service_manager as service_manager;
 
 #[cfg(feature = "text")]