aboutsummaryrefslogtreecommitdiffstats
path: root/commands/util.go
diff options
context:
space:
mode:
authorRobin Jarry <robin@jarry.cc>2023-08-23 21:36:23 +0200
committerRobin Jarry <robin@jarry.cc>2023-08-27 18:44:12 +0200
commita5bc7ccf0cae608ac1e72ab4c9ebe5596eb8c988 (patch)
treebe2e5f55fc21980489dca61947ea6b9819853ec3 /commands/util.go
parentfff16640ad7cd8c4b73187fbce10f2aa558701be (diff)
downloadaerc-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/util.go')
-rw-r--r--commands/util.go9
1 files changed, 2 insertions, 7 deletions
diff --git a/commands/util.go b/commands/util.go
index 7e21e167..aeb18237 100644
--- a/commands/util.go
+++ b/commands/util.go
@@ -13,12 +13,12 @@ import (
"github.com/lithammer/fuzzysearch/fuzzy"
"git.sr.ht/~rjarry/aerc/lib"
+ "git.sr.ht/~rjarry/aerc/lib/xdg"
"git.sr.ht/~rjarry/aerc/log"
"git.sr.ht/~rjarry/aerc/models"
"git.sr.ht/~rjarry/aerc/widgets"
"git.sr.ht/~rjarry/aerc/worker/types"
"github.com/gdamore/tcell/v2"
- "github.com/mitchellh/go-homedir"
)
// QuickTerm is an ephemeral terminal for running a single command and quitting.
@@ -80,13 +80,8 @@ func CompletePath(path string) []string {
path = cwd
}
- path, err := homedir.Expand(path)
- if err != nil {
- return nil
- }
-
// strip trailing slashes, etc.
- path = filepath.Clean(path)
+ path = filepath.Clean(xdg.ExpandHome(path))
if _, err := os.Stat(path); os.IsNotExist(err) {
// if the path doesn't exist, it is likely due to it being a partial path