alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

options: do not canonicalize maildir-path

Browse Source 
This doesn't play well with shells that don't expand options (such as
bash) in combination with "ExpandPath".

Fixes #2793.
This commit is contained in:
Dirk-Jan C. Binnema
2024-12-09 20:02:40 +02:00
parent dee7e5951c
commit d8d5e4cca5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mu/mu-options.cc
View File

@ -456,11 +456,12 @@ sub_init(CLI::App& sub, Options& opts)
return {}; 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("<maildir>") ->type_name("<maildir>")
->default_val(default_mdir) ->default_val(default_mdir)
->transform(ExpandPath, "expand maildir path") ->transform(ExpandPath, "expand maildir path");
->transform(CanonicalizePath, "canonicalize maildir path"); // don't attempt to canonicalize; in bash this breaks together with
// expand path.
sub.add_option("--my-address", opts.init.my_addresses, sub.add_option("--my-address", opts.init.my_addresses,
"Personal e-mail address or regexp") "Personal e-mail address or regexp")
->type_name("<address>"); ->type_name("<address>");
@ -513,7 +514,6 @@ sub_move(CLI::App& sub, Options& opts)
sub.add_option("source", opts.move.src, "Message file to move") sub.add_option("source", opts.move.src, "Message file to move")
->type_name("<message-path>") ->type_name("<message-path>")
->transform(ExpandPath, "expand source path") ->transform(ExpandPath, "expand source path")
->transform(CanonicalizePath, "canonicalize source path")
->required(); ->required();
sub.add_option("destination", opts.move.dest, sub.add_option("destination", opts.move.dest,
"Destination maildir") "Destination maildir")