Skip to content
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

Fix #72: mkdir for datafile if necessary #73

Merged
merged 3 commits into from
Jan 27, 2023
Merged

Fix #72: mkdir for datafile if necessary #73

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2adfbb0
Fix #72: mkdir for datafile if necessary
mattmc3 Dec 28, 2022
86cda3b
Use default directory if ZSHZ_DATA set w/o one
mattmc3 Jan 4, 2023
91c4ca6
Error if ZSHZ_DATA improperly set
mattmc3 Jan 19, 2023
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
16 changes: 13 additions & 3 deletions zsh-z.plugin.zsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,19 @@ zshz() {
local REPLY
local -a lines

# Allow the user to specify the datafile name in $ZSHZ_DATA (default: ~/.z)
# Allow the user to specify a custom datafile in $ZSHZ_DATA (or legacy $_Z_DATA)
local custom_datafile="${ZSHZ_DATA:-$_Z_DATA}"

# If a datafile was provided as a standalone file without a directory path
# print a warning and exit
if [[ -n ${custom_datafile} && ${custom_datafile} != */* ]]; then
print "ERROR: You configured a custom Zsh-z datafile (${custom_datafile}), but have not specified its directory." >&2
exit
fi

# If the user specified a datafile, use that or default to ~/.z
# If the datafile is a symlink, it gets dereferenced
local datafile=${${ZSHZ_DATA:-${_Z_DATA:-${HOME}/.z}}:A}
local datafile=${${custom_datafile:-$HOME/.z}:A}

# If the datafile is a directory, print a warning and exit
if [[ -d $datafile ]]; then
Expand All @@ -161,7 +171,7 @@ zshz() {

# Make sure that the datafile exists before attempting to read it or lock it
# for writing
[[ -f $datafile ]] || touch "$datafile"
[[ -f $datafile ]] || { mkdir -p "${datafile:h}" && touch "$datafile" }

# Bail if we don't own the datafile and $ZSHZ_OWNER is not set
[[ -z ${ZSHZ_OWNER:-${_Z_OWNER}} && -f $datafile && ! -O $datafile ]] &&
Expand Down