diff options
| author | Robin Jarry <robin@jarry.cc> | 2023-08-23 21:36:23 +0200 |
|---|---|---|
| committer | Robin Jarry <robin@jarry.cc> | 2023-08-27 18:44:12 +0200 |
| commit | a5bc7ccf0cae608ac1e72ab4c9ebe5596eb8c988 (patch) | |
| tree | be2e5f55fc21980489dca61947ea6b9819853ec3 /commands/compose | |
| parent | fff16640ad7cd8c4b73187fbce10f2aa558701be (diff) | |
| download | aerc-a5bc7ccf0cae608ac1e72ab4c9ebe5596eb8c988.tar.gz | |
xdg: get rid of deprecated dependencies
github.com/mitchellh/go-homedir has not received any update since 2019.
The last release of github.com/kyoh86/xdg was in 2020 and it has been
marked as deprecated by its author.
Replace these with internal functions.
Signed-off-by: Robin Jarry <robin@jarry.cc>
Reviewed-by: Moritz Poldrack <moritz@poldrack.dev>
Diffstat (limited to 'commands/compose')
| -rw-r--r-- | commands/compose/attach.go | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/commands/compose/attach.go b/commands/compose/attach.go index 3f6d124f..f9ef027f 100644 --- a/commands/compose/attach.go +++ b/commands/compose/attach.go @@ -14,9 +14,9 @@ import ( "git.sr.ht/~rjarry/aerc/config" "git.sr.ht/~rjarry/aerc/lib" "git.sr.ht/~rjarry/aerc/lib/ui" + "git.sr.ht/~rjarry/aerc/lib/xdg" "git.sr.ht/~rjarry/aerc/log" "git.sr.ht/~rjarry/aerc/widgets" - "github.com/mitchellh/go-homedir" "github.com/pkg/errors" "git.sr.ht/~sircmpwn/getopt" @@ -83,13 +83,7 @@ func (a Attach) Execute(aerc *widgets.Aerc, args []string) error { } func (a Attach) addPath(aerc *widgets.Aerc, path string) error { - path, err := homedir.Expand(path) - if err != nil { - log.Errorf("failed to expand path '%s': %v", path, err) - aerc.PushError(err.Error()) - return err - } - + path = xdg.ExpandHome(path) attachments, err := filepath.Glob(path) if err != nil && errors.Is(err, filepath.ErrBadPattern) { log.Warnf("failed to parse as globbing pattern: %v", err) |