Merge remote-tracking branch 'origin/release/0.2' into feature/repo

gu-provider/Cargo.toml

@@ -54,6 +54,7 @@ default = ["env-docker"]
 win-service = ["windows-service"]
 clinfo = ["gu-hardware/clinfo"]
 env-docker = ["async_docker"]
+env-hd = []
 ssl=["openssl/vendored", "actix-web/ssl"]
 
 [package.metadata.deb]

gu-provider/src/exec_plugin.rs

@@ -455,7 +455,9 @@ impl Module for ExecPlugModule {
             .unwrap_or_else(|e| log::debug!("on scan /usr/lib/golemu/plugins: {}", e));
         #[cfg(windows)]
         {
-            let _ = scan_for_plugins("plugins".as_ref(), config);
+            let cur_dir = std::env::current_dir().unwrap();
+            let _ = scan_for_plugins(cur_dir.as_ref(), config)
+                .unwrap_or_else(|e| log::error!("on scan {:?}/plugins: {}", work_dir, e));
         }
         #[cfg(target_os = "macos")]
         {

gu-provider/src/main.rs

@@ -9,6 +9,7 @@ mod connect;
 mod deployment;
 pub mod envman;
 mod fchain;
+#[cfg(feature = "env-hd")]
 mod hdman;
 mod id;
 mod permission;

gu-provider/src/server.rs

@@ -30,6 +30,7 @@ use crate::connect::{
     self, AutoMdns, Connect, ConnectManager, ConnectModeMessage, ConnectionChange,
     ConnectionChangeMessage, Disconnect, ListSockets,
 };
+#[cfg(feature = "env-hd")]
 use crate::hdman::HdMan;
 
 #[derive(Serialize, Deserialize, Clone)]
@@ -184,6 +185,8 @@ impl Module for ServerModule {
         gu_base::run_once(move || {
             let dec = decorator.to_owned();
             let config_module: &ConfigModule = dec.extract().unwrap();
+
+            #[cfg(feature = "env-hd")]
             let _ = HdMan::start(config_module);
 
             ProviderServer::from_registry().do_send(InitServer {