Skip to content

Add support for XDG Base Directory spec #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FiXato wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for XDG Base Directory spec #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
971a173
Add support for XDG Base Directory spec
Jan 17, 2021
462bfd9
Implement changes as suggest by @akinomyoga
Jan 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion fzf-marks.plugin.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,25 @@

command -v fzf >/dev/null 2>&1 || return

PROGRAM_NAME="${PROGRAM_NAME:-fzf-marks}"

_fzm_config_dir="${XDG_CONFIG_HOME:-$HOME/.config}/$PROGRAM_NAME" #currently unused, but in the future can be used to load (and store?) an .env file from to more easily switch between multiple configuration
_fzm_data_dir="${XDG_DATA_HOME:-$HOME/.local/share}/$PROGRAM_NAME"
_fzm_legacy_marks_file="${HOME}/.fzf-marks"

if [[ -z ${FZF_MARKS_FILE-} ]] ; then
FZF_MARKS_FILE=${HOME}/.fzf-marks
FZF_MARKS_FILE=${_fzm_data_dir}/default_bookmarks.fzf-marks
fi

if [[ ! -f ${FZF_MARKS_FILE} ]]; then
# Fallback support for the previous default location of the bookmarks file.
if [[ -f ${_fzm_legacy_marks_file} ]]; then
echo "Your FZF_MARKS_FILE is still in its legacy location of '${_fzm_legacy_marks_file}'; you might want to consider moving it to '${FZF_MARKS_FILE}' so it follows the XDG standard, or explicitly set FZF_MARKS_FILE='${_fzm_legacy_marks_file}'." >&2
FZF_MARKS_FILE=${_fzm_legacy_marks_file}
else
[[ ! -d ${_fzm_data_dir} ]] && (umask 077; mkdir "${_fzm_data_dir}")
touch "${FZF_MARKS_FILE}"
fi
fi

if [[ -z ${FZF_MARKS_COMMAND-} ]] ; then
Expand Down