From 4e62839513d32211a109b91f3099521c18e99b93 Mon Sep 17 00:00:00 2001
From: Andrey Golovizin <ag@sologoc.com>
Date: Sat, 15 Apr 2023 12:53:55 +0200
Subject: [PATCH] Move --machine to main options

---
 src/main.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index bbf6913..faf9a11 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -19,6 +19,9 @@ struct Opts {
     #[arg(short, long)]
     json: bool,
 
+    #[arg(short, long)]
+    machine: Option<PathBuf>,
+
     #[command(subcommand)]
     command: Command,
 }
@@ -34,9 +37,6 @@ struct ConfigOpts {
 
     #[arg(short = '4', long)]
     no_ipv6: bool,
-
-    #[arg(short, long)]
-    machine: Option<PathBuf>,
 }
 
 #[derive(Subcommand, Debug)]
@@ -96,7 +96,7 @@ fn list_locations(opts: &Opts) -> Result<(), anyhow::Error> {
     Ok(())
 }
 
-fn get_config(_opts: &Opts, config_opts: &ConfigOpts) -> Result<(), anyhow::Error> {
+fn get_config(opts: &Opts, config_opts: &ConfigOpts) -> Result<(), anyhow::Error> {
     let locations = api::get_locations()?;
     let location = locations
         .locations
@@ -104,7 +104,7 @@ fn get_config(_opts: &Opts, config_opts: &ConfigOpts) -> Result<(), anyhow::Erro
         .find(|location| location.name == config_opts.location)
         .ok_or_else(|| anyhow::anyhow!("no such location: {}", config_opts.location))?;
     debug!("location = {:?}", &location);
-    let keys = get_keys(config_opts.machine.as_ref())?;
+    let keys = get_keys(opts.machine.as_ref())?;
     debug!("keys = {:?}", &keys);
     let addresses = api::add_ip(&config_opts.username, &config_opts.token, &keys.public_key)?;