From d8d5e4cca54891e46eef124f3b559e2a878ce74a Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Mon, 9 Dec 2024 20:02:40 +0200 Subject: [PATCH] options: do not canonicalize maildir-path This doesn't play well with shells that don't expand options (such as bash) in combination with "ExpandPath". Fixes #2793. --- mu/mu-options.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mu/mu-options.cc b/mu/mu-options.cc index d01c824e..40a8c12a 100644 --- a/mu/mu-options.cc +++ b/mu/mu-options.cc @@ -456,11 +456,12 @@ sub_init(CLI::App& sub, Options& opts) return {}; }); - sub.add_option("--maildir,-m", opts.init.maildir, "Top of the maildir") + sub.add_option("--maildir,-m", opts.init.maildir, "Root maildir") ->type_name("") ->default_val(default_mdir) - ->transform(ExpandPath, "expand maildir path") - ->transform(CanonicalizePath, "canonicalize maildir path"); + ->transform(ExpandPath, "expand maildir path"); + // don't attempt to canonicalize; in bash this breaks together with + // expand path. sub.add_option("--my-address", opts.init.my_addresses, "Personal e-mail address or regexp") ->type_name("
"); @@ -513,7 +514,6 @@ sub_move(CLI::App& sub, Options& opts) sub.add_option("source", opts.move.src, "Message file to move") ->type_name("") ->transform(ExpandPath, "expand source path") - ->transform(CanonicalizePath, "canonicalize source path") ->required(); sub.add_option("destination", opts.move.dest, "Destination maildir")