X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-setup.c;h=9aaf9286e8b257bd4946c7f81804b80117d5e3ca;hp=475248b1f9735b2e10f00f013deffa0baac85e7a;hb=64b155842a87c228c45ec20fb163891695e6ccc2;hpb=f0dfda5c7797f9db81ce35d270fe0ac406c7fca1

diff --git a/notmuch-setup.c b/notmuch-setup.c
index 475248b1..9aaf9286 100644
--- a/notmuch-setup.c
+++ b/notmuch-setup.c
@@ -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;
 }