From 60f0e3dbc10cbac6e4a8e022f12c781260a62803 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Sat, 22 Mar 2025 15:29:08 -0500
Subject: [PATCH] refactor

---
 repertory/repertory/include/cli/mount.hpp | 34 +++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/repertory/repertory/include/cli/mount.hpp b/repertory/repertory/include/cli/mount.hpp
index 6a85ea23..ffc774e6 100644
--- a/repertory/repertory/include/cli/mount.hpp
+++ b/repertory/repertory/include/cli/mount.hpp
@@ -116,19 +116,19 @@ mount(std::vector<const char *> args, std::string data_directory,
                     : " [" + unique_id + ']')
             << " Drive" << std::endl;
   if (prov == provider_type::remote) {
-    std::uint16_t port{};
-    if (not utils::get_next_available_port(config.get_remote_config().api_port,
-                                           port)) {
-      std::cerr << "FATAL: Unable to get available port" << std::endl;
-      return exit_code::startup_exception;
-    }
-
-    auto remote_cfg = config.get_remote_config();
-    remote_cfg.host_name_or_ip = remote_host;
-    remote_cfg.api_port = remote_port;
-    config.set_remote_config(remote_cfg);
-
     try {
+      std::uint16_t port{};
+      if (not utils::get_next_available_port(config.get_remote_config().api_port,
+                                             port)) {
+        std::cerr << "FATAL: Unable to get available port" << std::endl;
+        return exit_code::startup_exception;
+      }
+
+      auto remote_cfg = config.get_remote_config();
+      remote_cfg.host_name_or_ip = remote_host;
+      remote_cfg.api_port = remote_port;
+      config.set_remote_config(remote_cfg);
+
       remote_drive drive(
           config,
           [&config]() -> std::unique_ptr<remote_instance> {
@@ -148,12 +148,12 @@ mount(std::vector<const char *> args, std::string data_directory,
     return exit_code::startup_exception;
   }
 
-  if (prov == provider_type::sia && config.get_sia_config().bucket.empty()) {
-    [[maybe_unused]] auto bucket =
-        config.set_value_by_name("SiaConfig.Bucket", unique_id);
-  }
-
   try {
+    if (prov == provider_type::sia && config.get_sia_config().bucket.empty()) {
+      [[maybe_unused]] auto bucket =
+          config.set_value_by_name("SiaConfig.Bucket", unique_id);
+    }
+
     auto provider = create_provider(prov, config);
     repertory_drive drive(config, lock, *provider);
     if (not lock.set_mount_state(true, "", -1)) {