aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--commands/account/export-mbox.go3
-rw-r--r--commands/account/import-mbox.go3
2 files changed, 6 insertions, 0 deletions
diff --git a/commands/account/export-mbox.go b/commands/account/export-mbox.go
index 14d9290e..2eed570a 100644
--- a/commands/account/export-mbox.go
+++ b/commands/account/export-mbox.go
@@ -11,6 +11,7 @@ import (
"git.sr.ht/~rjarry/aerc/app"
"git.sr.ht/~rjarry/aerc/commands"
"git.sr.ht/~rjarry/aerc/lib"
+ "git.sr.ht/~rjarry/aerc/lib/xdg"
"git.sr.ht/~rjarry/aerc/log"
mboxer "git.sr.ht/~rjarry/aerc/worker/mbox"
"git.sr.ht/~rjarry/aerc/worker/types"
@@ -42,6 +43,8 @@ func (e ExportMbox) Execute(args []string) error {
return errors.New("No message store selected")
}
+ e.Filename = xdg.ExpandHome(e.Filename)
+
fi, err := os.Stat(e.Filename)
if err == nil && fi.IsDir() {
if path := acct.SelectedDirectory(); path != "" {
diff --git a/commands/account/import-mbox.go b/commands/account/import-mbox.go
index 7aa393b6..e326edce 100644
--- a/commands/account/import-mbox.go
+++ b/commands/account/import-mbox.go
@@ -11,6 +11,7 @@ import (
"git.sr.ht/~rjarry/aerc/app"
"git.sr.ht/~rjarry/aerc/commands"
+ "git.sr.ht/~rjarry/aerc/lib/xdg"
"git.sr.ht/~rjarry/aerc/log"
"git.sr.ht/~rjarry/aerc/models"
mboxer "git.sr.ht/~rjarry/aerc/worker/mbox"
@@ -48,6 +49,8 @@ func (i ImportMbox) Execute(args []string) error {
return errors.New("No directory selected")
}
+ i.Filename = xdg.ExpandHome(i.Filename)
+
importFolder := func() {
defer log.PanicHandler()
statusInfo := fmt.Sprintln("Importing", i.Filename, "to folder", folder)