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

dotenv plugin: agree once improvement #8729

Merged
merged 8 commits into from
Mar 23, 2020
Merged

dotenv plugin: agree once improvement #8729

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dcc043b
dotenv: add possibility to agree once for a given .env file
Mar 10, 2020
87c30ed
refactor: fix code style
Mar 10, 2020
cabb9e2
Update plugins/dotenv/dotenv.plugin.zsh
Jblew Mar 11, 2020
5eb248d
Use grep and clean up allowed list check logic
mcornella Mar 22, 2020
29fff53
Simplify and reorder file; change default allowed list path
mcornella Mar 22, 2020
5f8682e
Add new feature to README
mcornella Mar 23, 2020
6a63853
Make sure ZSH_CACHE_DIR is defined
mcornella Mar 23, 2020
0b08391
Resolve symlinks in $PWD before storing in allowed list
mcornella Mar 23, 2020
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
35 changes: 26 additions & 9 deletions plugins/dotenv/dotenv.plugin.zsh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
source_env() {
if [[ -f $ZSH_DOTENV_FILE ]]; then
if [ "$ZSH_DOTENV_PROMPT" != "false" ]; then
# confirm before sourcing file
local confirmation
# print same-line prompt and output newline character if necessary
echo -n "dotenv: source '$ZSH_DOTENV_FILE' file in the directory? (Y/n) "
read -k 1 confirmation; [[ "$confirmation" != $'\n' ]] && echo
# only bail out if confirmation character is n
if [[ "$confirmation" = [nN] ]]; then
return
# agree list
touch "${ZSH_DOTENV_AGREE_LIST_FILE}"
local dotenv_absolutepath="$(readlink -f $ZSH_DOTENV_FILE)"
Jblew marked this conversation as resolved.
Show resolved Hide resolved
local agree_list="${(@f)"$(<${ZSH_DOTENV_AGREE_LIST_FILE})"}"
[[ ${agree_list[(ie)$]} -le ${#agree_list} ]]; local alreadyagreed=$?

if ! [ "$alreadyagreed" = "1" ]; then
# confirm before sourcing file
local confirmation
# print same-line prompt and output newline character if necessary
echo -n "dotenv: source '$ZSH_DOTENV_FILE' file in the directory? ([Y]es/[a]lways/[n]n) "
read -k 1 confirmation; [[ "$confirmation" != $'\n' ]] && echo
# only bail out if confirmation character is n
if [[ "$confirmation" = [nN] ]]; then
return
fi

if [[ "$confirmation" = [aA] ]]; then
echo "${dotenv_absolutepath}" >> "${ZSH_DOTENV_AGREE_LIST_FILE}"
fi
fi
fi

Expand All @@ -29,7 +41,12 @@ autoload -U add-zsh-hook
add-zsh-hook chpwd source_env

if [[ -z $ZSH_DOTENV_FILE ]]; then
ZSH_DOTENV_FILE=.env
ZSH_DOTENV_FILE=.env
fi

if [[ -z $ZSH_DOTENV_AGREE_LIST_FILE ]]; then
ZSH_DOTENV_AGREE_LIST_FILE="${ZSH}/dotenv-agree.list"
fi

source_env