From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 2 Jun 2021 18:03:59 +0000 (+0100)
Subject: otter cli: Change defaulting order of server and account
X-Git-Tag: otter-0.7.0~91
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2327a7a17bc7dd7b23f44611c62aded330c4bb0c;p=otter.git

otter cli: Change defaulting order of server and account

We're going to need the server to decide the account.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index 1a2e181d..74c7b985 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -497,6 +497,13 @@ fn main() {
       Ok(spec_dir)
     })?;
 
+    let server = server.map(Ok::<_,APE>).unwrap_or_else(||{
+      Ok(SL::Socket(
+        config.clone()?.0
+          .command_socket.clone()
+      ))
+    })?;
+
     let account: AccountName = account.map(Ok::<_,APE>).unwrap_or_else(||{
       let user = env::var("USER").map_err(|e| ArgumentParseError(
         format!("default account needs USER env var: {}", &e)
@@ -507,13 +514,6 @@ fn main() {
       })
     })?;
 
-    let server = server.map(Ok::<_,APE>).unwrap_or_else(||{
-      Ok(SL::Socket(
-        config.clone()?.0
-          .command_socket.clone()
-      ))
-    })?;
-
     let sc = inventory::iter::<Subcommand>.into_iter()
       .filter(|Subcommand{verb:found,..}| found == &subcommand)
       .next()