x.env section

roboplc-cli/Cargo.toml

 [package]
 name = "roboplc-cli"
-version = "0.5.0"
+version = "0.5.1"
 edition = "2021"
 authors = ["Serhij S. <div@altertech.com>"]
 license = "Apache-2.0"

roboplc-cli/src/config.rs

@@ -10,6 +10,8 @@ pub struct Config {
     pub remote: Remote,
     #[serde(default)]
     pub build: Build,
+    #[serde(default)]
+    pub x: X,
     #[serde(default, rename = "build-custom")]
     pub build_custom: BuildCustom,
 }
@@ -36,6 +38,12 @@ pub struct Build {
     pub cargo_args: Option<String>,
 }
 
+#[derive(Deserialize, Serialize, Default, Debug)]
+pub struct X {
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
+    pub env: BTreeMap<String, String>,
+}
+
 #[derive(Deserialize, Serialize, Default, Debug)]
 pub struct BuildCustom {
     #[serde(skip_serializing_if = "Option::is_none")]

roboplc-cli/src/main.rs

-use std::{fs, time::Duration};
+use std::{collections::btree_map, fs, time::Duration};
 
-use arguments::{Args, SubCommand};
+use arguments::{Args, FlashExec, SubCommand};
 use clap::Parser;
 use common::{find_robo_toml, Mode};
 use once_cell::sync::OnceCell;
@@ -59,6 +59,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     }
     let mut maybe_timeout = args.timeout;
     let mut build_config = None;
+    let mut x_config = None;
     let mut build_custom = None;
     if let SubCommand::New(_) = args.subcmd {
         // do not parse robo.toml for `new` command
@@ -76,6 +77,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         }
         build_config = Some(robo_toml.build);
         build_custom = Some(robo_toml.build_custom);
+        x_config = Some(robo_toml.x);
     }
     maybe_url = maybe_url.map(|v| {
         let mut u = v.trim_end_matches('/').to_owned();
@@ -133,11 +135,19 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             flashing::rollback(&url, &key, agent, opts)?;
         }
         SubCommand::Exec(opts) => {
+            let mut opts: FlashExec = opts.into();
+            if let Some(x_conf) = x_config {
+                for (k, v) in x_conf.env {
+                    if let btree_map::Entry::Vacant(e) = opts.program_env.entry(k) {
+                        e.insert(v);
+                    }
+                }
+            }
             flashing::flash(
                 &url,
                 &key,
                 agent,
-                opts.into(),
+                opts,
                 build_config.unwrap_or_default(),
                 build_custom.unwrap_or_default(),
                 true,

roboplc-cli/src/project.rs

@@ -52,6 +52,7 @@ pub fn create(
         },
         build: <_>::default(),
         build_custom: <_>::default(),
+        x: <_>::default(),
     };
     if let Some(docker_arch) = opts.docker {
         robo_toml.build.target = Some(docker_arch.target().to_owned());