Merge branch 'master' into default-conf-dir

3 files changed, 3 insertions, 3 deletions

diff --git a/src/app/app.rs b/src/app/app.rs
index 0898dec..17ae9bc 100644
--- a/src/app/app.rs
+++ b/src/app/app.rs
@@ -696,7 +696,7 @@ impl App {
 
         self.screen.clear_bottom_right_char(w, &skin.focused)?;
 
-        if let Some(raw_sequence) = &con.launch_args.commands {
+        if let Some(raw_sequence) = &con.launch_args.cmd {
             self.tx_seqs
                 .send(Sequence::new_local(raw_sequence.to_string()))
                 .unwrap();
diff --git a/src/cli/args.rs b/src/cli/args.rs
index a81d25e..8ef4b89 100644
--- a/src/cli/args.rs
+++ b/src/cli/args.rs
@@ -110,7 +110,7 @@ pub struct Args {
 
     /// Semicolon separated commands to execute
     #[clap(short, long, value_parser)]
-    pub commands: Option<String>,
+    pub cmd: Option<String>,
 
     /// Whether to have styles and colors (auto is default and usually OK)
     #[clap(long, arg_enum, value_parser, default_value="auto")]
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index bd18a89..903bb33 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -105,7 +105,7 @@ pub fn run() -> Result<Option<Launchable>, ProgramError> {
             net::{Client, Message},
         };
         let client = Client::new(server_name);
-        if let Some(seq) = &context.launch_args.commands {
+        if let Some(seq) = &context.launch_args.cmd {
             let message = Message::Sequence(Sequence::new_local(seq.to_string()));
             client.send(&message)?;
         } else if !context.launch_args.get_root {