Move everything into workspace

unshell-manager/Cargo.toml

@@ -3,16 +3,17 @@ name = "unshell-manager"
 edition = "2024"
 
 [features]
-obfuscate = ["unshell-obfuscate/obfuscate"]
-log = ["unshell-lib/log"]
-log_debug = ["unshell-lib/log_debug"]
+log = ["unshell/log"]
+log_debug = ["log", "unshell/log_debug"]
 
-client = ["unshell-lib/client"]
-server = ["unshell-lib/server"]
+obfuscate = ["unshell-obfuscate/obfuscate"]
+
+# client = ["unshell-lib/client"]
+# server = ["unshell-lib/server"]
 
 [dependencies]
-unshell-lib = {path = "../unshell-lib", default-features = false}
-unshell-obfuscate = {path = "../unshell-obfuscate", default-features = false}
+unshell = {path = "../", default-features = false}
+unshell-obfuscate = {path = "../unshell-obfuscate"}
 
 bincode = "2.0.1"
 libc = "0.2.178"

unshell-manager/src/interface.rs

@@ -1,7 +1,7 @@
 // use std::collections::HashMap;
 use std::fmt::Debug;
-use unshell_lib::Result;
-use unshell_lib::config::RuntimeConfig;
+use unshell::Result;
+use unshell::config::RuntimeConfig;
 
 use crate::ModuleRuntime;
 

unshell-manager/src/lib.rs

@@ -13,8 +13,8 @@ pub use module::Module;
 
 pub use interface::{InterfaceWrapper, NamedComponent, PayloadConfig};
 
-extern crate unshell_lib;
-use unshell_lib::Result;
+// extern crate unshell_lib;
+use unshell::Result;
 
 /// Trait for defining modules that have a runtime.
 pub trait ModuleRuntime: Send + Sync {

unshell-manager/src/manager/announcement.rs

@@ -1,5 +1,5 @@
 use crate::Manager;
-use unshell_lib::Announcement;
+use unshell::Announcement;
 
 impl Manager {
     pub fn recv_announcement(&mut self, announcement: &Announcement) {

unshell-manager/src/manager/mod.rs

@@ -8,7 +8,7 @@ use std::{
     time::Duration,
 };
 
-use unshell_lib::{Announcement, Result, config::RuntimeConfig, debug, warn};
+use unshell::{Result, config::RuntimeConfig, debug, warn};
 use unshell_obfuscate::symbol;
 
 use crate::{

unshell-manager/src/module.rs

@@ -1,5 +1,5 @@
 use libloading::{Library, Symbol};
-use unshell_lib::{
+use unshell::{
     ModuleError, Result,
     logger::{self, SetupLogger, logger},
     warn,

unshell-manager/src/proc_load.rs

@@ -3,7 +3,7 @@
 use std::{ffi::CString, io};
 
 use libloading::Library;
-use unshell_lib::{ModuleError, Result, warn};
+use unshell::{ModuleError, Result, warn};
 
 // The `memfd_create` syscall flags (MFD_CLOEXEC is common and good practice)
 const MFD_CLOEXEC: u32 = 0x0001;