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 1a2e181ddc5d1f815fd3565d6e3207e07a74d7d0..74c7b985ac83289e145db7c099566e80c2b80d37 100644 (file)
--- 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()