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.

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

Enable null globs when scanning for config.d/*.sh #33

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
Enable null globs when scanning for config.d/*.sh
Without this, an empty directory leads to an false error complaining that the file `/etc/dehydrated/config.d/*.sh` is not readable or doesn't exist.

With `nullglob` set, the glob, if it doesn't match anything, will expand into null rather than returning the glob string, causing an empty config.d folder to not throw an error.
  • Loading branch information
nogweii authored Sep 30, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit a6df8628261efa587dfb01a1a1d7d1a4e2426e21
4 changes: 4 additions & 0 deletions pdns_api.sh
Original file line number Diff line number Diff line change
@@ -103,8 +103,10 @@ load_config() {
if [[ -n "${ZSH_VERSION:-}" ]]
then
set +o noglob
setopt null_glob
else
set +f
shopt -s nullglob
fi

for check_config_d in "${CONFIG_D}"/*.sh; do
@@ -121,8 +123,10 @@ load_config() {
if [[ -n "${ZSH_VERSION:-}" ]]
then
set -o noglob
setopt no_null_glob
else
set -f
shopt -u nullglob
fi
fi