starred/dehydrated
1
0
Fork 0
mirror of https://github.com/dehydrated-io/dehydrated.git synced 2026-07-06 13:05:18 +02:00
Code Issues 79 Packages Projects Releases 10 Wiki Activity

use nullglob, disable warning on empty CONFIG_D directory

Browse Source
This commit is contained in:
Lukas Schauer
2017-09-21 18:10:01 +02:00
parent b5e178ea75
commit da3428a84a
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dehydrated
+4 -8
View File
@@ -8,7 +8,9 @@
set -e set -e
set -u set -u
set -o pipefail set -o pipefail
[[ -n "${ZSH_VERSION:-}" ]] && set -o SH_WORD_SPLIT && set +o FUNCTION_ARGZERO [[ -n "${ZSH_VERSION:-}" ]] && set -o SH_WORD_SPLIT && set +o FUNCTION_ARGZERO && set -o NULL_GLOB
[[ -z "${ZSH_VERSION:-}" ]] && shopt -s nullglob
umask 077 # paranoid umask, we're creating private keys umask 077 # paranoid umask, we're creating private keys
VERSION="0.4.0" VERSION="0.4.0"
@@ -153,10 +155,7 @@ load_config() {
fi fi
for check_config_d in "${CONFIG_D}"/*.sh; do for check_config_d in "${CONFIG_D}"/*.sh; do
if [[ ! -e "${check_config_d}" ]]; then if [[ -f "${check_config_d}" ]] && [[ -r "${check_config_d}" ]]; then
echo "# !! WARNING !! Extra configuration directory ${CONFIG_D} exists, but no configuration found in it." >&2
break
elif [[ -f "${check_config_d}" ]] && [[ -r "${check_config_d}" ]]; then
echo "# INFO: Using additional config file ${check_config_d}" echo "# INFO: Using additional config file ${check_config_d}"
# shellcheck disable=SC1090 # shellcheck disable=SC1090
. "${check_config_d}" . "${check_config_d}"
@@ -1199,9 +1198,6 @@ command_cleanup() {
# Loop over all files of this type # Loop over all files of this type
for file in "${certdir}/${filebase}-"*".${fileext}" "${certdir}/${filebase}-"*".${fileext}-revoked"; do for file in "${certdir}/${filebase}-"*".${fileext}" "${certdir}/${filebase}-"*".${fileext}-revoked"; do
# Handle case where no files match the wildcard
[[ -f "${file}" ]] || break
# Check if current file is in use, if unused move to archive directory # Check if current file is in use, if unused move to archive directory
filename="$(basename "${file}")" filename="$(basename "${file}")"
if [[ ! "${filename}" = "${current}" ]]; then if [[ ! "${filename}" = "${current}" ]]; then