X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=d35bda7263085f63ce644598e0c07a240ecbfb2e;hp=05aa52dce1d5b4e57949635b5bf2bc293f6c5174;hb=968feafbad724da29c7fb5d48f6d363150e48caf;hpb=5f8d44fa5b2d308b76f6942852d44c9e7ead4005

diff --git a/notmuch.c b/notmuch.c
index 05aa52dc..d35bda72 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -285,7 +285,7 @@ int
 setup_command (int argc, char *argv[])
 {
     notmuch_database_t *notmuch;
-    char *mail_directory;
+    char *mail_directory, *default_path;
     int count;
     add_files_state_t add_files_state;
     double elapsed;
@@ -310,25 +310,32 @@ setup_command (int argc, char *argv[])
 	    "such as mb2md. In that case, press Control-C now and run notmuch again\n"
 	    "once the conversion is complete.\n\n");
 
-    printf ("Top-level mail directory [~/mail]: ");
+
+    default_path = notmuch_database_default_path ();
+    printf ("Top-level mail directory [%s]: ", default_path);
     fflush (stdout);
 
     mail_directory = read_line ();
+    printf ("\n");
 
     if (mail_directory == NULL || strlen (mail_directory) == 0) {
-	char *home;
-
 	if (mail_directory)
 	    free (mail_directory);
-
-	home = getenv ("HOME");
-	if (!home) {
-	    fprintf (stderr, "Error: No mail directory provided HOME environment variable is not set.\n");
-	    fprintf (stderr, "Cowardly refusing to just guess where your mail might be.\n");
-	    exit (1);
+	mail_directory = default_path;
+    } else {
+	/* XXX: Instead of telling the user to use an environment
+	 * variable here, we should really be writing out a configuration
+	 * file and loading that on the next run. */
+	if (strcmp (mail_directory, default_path)) {
+	    printf ("Note: Since you are not using the default path, you will want to set\n"
+		    "the NOTMUCH_BASE environment variable to %s so that\n"
+		    "future calls to notmuch commands will know where to find your mail.\n",
+		    mail_directory);
+	    printf ("For example, if you are using bash for your shell, add:\n\n");
+	    printf ("\texport NOTMUCH_BASE=%s\n\n", mail_directory);
+	    printf ("to your ~/.bashrc file.\n\n");
 	}
-
-	mail_directory = g_strdup_printf ("%s/mail", home);
+	free (default_path);
     }
 
     notmuch = notmuch_database_create (mail_directory);