Merge branch 'release'

[notmuch] / notmuch-setup.c

diff --git a/notmuch-setup.c b/notmuch-setup.c
index 475248b1f9735b2e10f00f013deffa0baac85e7a..9a66810db385cbbb9e64f93d7af4f1953546be44 100644 (file)
--- a/notmuch-setup.c
+++ b/notmuch-setup.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
@@ -140,11 +140,18 @@ notmuch_setup_command (notmuch_config_t *config,
        fflush (stdout);                                        \
        if (getline (&response, &response_size, stdin) < 0) {   \
            printf ("Exiting.\n");                              \
-           exit (1);                                           \
+           exit (EXIT_FAILURE);                                \
        }                                                       \
        chomp_newline (response);                               \
     } while (0)
 
+    if (notmuch_minimal_options ("setup", argc, argv) < 0)
+       return EXIT_FAILURE;
+
+    if (notmuch_requested_db_uuid)
+       fprintf (stderr, "Warning: ignoring --uuid=%s\n",
+                notmuch_requested_db_uuid);
+
     if (notmuch_config_is_new (config))
        welcome_message_pre_setup ();
 
@@ -223,12 +230,11 @@ notmuch_setup_command (notmuch_config_t *config,
        g_ptr_array_free (tags, TRUE);
     }
 
+    if (notmuch_config_save (config))
+       return EXIT_FAILURE;
 
-    if (! notmuch_config_save (config)) {
-       if (notmuch_config_is_new (config))
-         welcome_message_post_setup ();
-       return 0;
-    } else {
-       return 1;
-    }
+    if (notmuch_config_is_new (config))
+       welcome_message_post_setup ();
+
+    return EXIT_SUCCESS;
 }