From 0204f5e17fd5a3e2448bcacb446bd11a497f63e2 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sat, 15 Aug 2015 00:43:06 +0200 Subject: 36091: _ncftp: search XDG_DATA_HOME for bookmarks saved by lftp --- ChangeLog | 5 +++++ Completion/Unix/Command/_ncftp | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index abba0622c..a13e05d08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-08-15 Mikael Magnusson + + * Eric Cook: 36091: Completion/Unix/Command/_ncftp: search + XDG_DATA_HOME for bookmarks saved by lftp + 2015-08-14 Oliver Kiddle * 36146: Completion/Zsh/Type/_command_names, diff --git a/Completion/Unix/Command/_ncftp b/Completion/Unix/Command/_ncftp index 93de404aa..763a61344 100644 --- a/Completion/Unix/Command/_ncftp +++ b/Completion/Unix/Command/_ncftp @@ -1,6 +1,12 @@ #compdef ncftp lftp -local expl bookmarks=$HOME/.$service/bookmarks +local expl bookmarks XDG_DATA_HOME=${XDG_DATA_HOME:-$HOME/.local/share} + +if [[ $service = lftp ]]; then + bookmarks=$XDG_DATA_HOME/$service/bookmarks +else + bookmarks=$HOME/.$service/bookmarks +fi if [[ -f $bookmarks ]]; then bookmarks=(${"${(f)$(<$bookmarks)}"%%[[:space:],]*}) -- cgit 1.4.1