Fix shellcheck reported issues
This commit is contained in:
parent
2c7b4ddc55
commit
bd4eee7925
2 changed files with 6 additions and 6 deletions
|
@ -4,9 +4,9 @@ manager_dn=$(cat "${__object}/parameter/manager-dn")
|
||||||
manager_password=$(cat "${__object}/parameter/manager-password")
|
manager_password=$(cat "${__object}/parameter/manager-password")
|
||||||
description=$(cat "${__object}/parameter/description")
|
description=$(cat "${__object}/parameter/description")
|
||||||
suffix=$(cat "${__object}/parameter/suffix")
|
suffix=$(cat "${__object}/parameter/suffix")
|
||||||
suffix_dc=$(echo -n ${suffix} | awk -F',' '{print $1}' | awk -F'=' '{print $2}')
|
suffix_dc=$(printf "%s" "${suffix}" | awk -F',' '{print $1}' | awk -F'=' '{print $2}')
|
||||||
|
|
||||||
SLAPD_IPC=$(cat "${__object}/parameter/slapd-url" | tr '\n' ' ' | awk '{ print $1}')
|
SLAPD_IPC=$(tr '\n' ' ' < "${__object}/parameter/slapd-url" | awk '{ print $1}')
|
||||||
|
|
||||||
cat <<DONE # | tee /dev/stderr
|
cat <<DONE # | tee /dev/stderr
|
||||||
# Restart service
|
# Restart service
|
||||||
|
|
|
@ -7,7 +7,7 @@ serverid=$(cat "${__object}/parameter/serverid")
|
||||||
suffix=$(cat "${__object}/parameter/suffix")
|
suffix=$(cat "${__object}/parameter/suffix")
|
||||||
slapd_modules=$(cat "${__object}/parameter/module" 2>/dev/null || true)
|
slapd_modules=$(cat "${__object}/parameter/module" 2>/dev/null || true)
|
||||||
schemas=$(cat "${__object}/parameter/schema")
|
schemas=$(cat "${__object}/parameter/schema")
|
||||||
slapd_urls=$(cat "${__object}/parameter/slapd-url" | tr '\n' ' ')
|
slapd_urls=$(tr '\n' ' ' < "${__object}/parameter/slapd-url")
|
||||||
tls_cipher_suite=$(cat "${__object}/parameter/tls-cipher-suite" 2>/dev/null || true)
|
tls_cipher_suite=$(cat "${__object}/parameter/tls-cipher-suite" 2>/dev/null || true)
|
||||||
|
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ case "${os}" in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
PKG_MAIN=$(echo ${PKGS} | awk '{print $1;}')
|
PKG_MAIN=$(echo "${PKGS}" | awk '{print $1;}')
|
||||||
|
|
||||||
|
|
||||||
# Determine if __letsencrypt_cert is to be used and setup vars accordingly
|
# Determine if __letsencrypt_cert is to be used and setup vars accordingly
|
||||||
|
@ -117,7 +117,7 @@ fi
|
||||||
|
|
||||||
# Install required packages
|
# Install required packages
|
||||||
for pkg in ${PKGS}; do
|
for pkg in ${PKGS}; do
|
||||||
__package ${pkg}
|
__package "${pkg}"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
|
@ -147,7 +147,7 @@ case "${os}" in
|
||||||
|
|
||||||
require="__line/rm_slapd_conf" __line add_slapd_conf \
|
require="__line/rm_slapd_conf" __line add_slapd_conf \
|
||||||
--file ${ETC}/default/slapd \
|
--file ${ETC}/default/slapd \
|
||||||
--line 'SLAPD_CONF=${SLAPD_DIR}/slapd.conf' \
|
--line "SLAPD_CONF=${SLAPD_DIR}/slapd.conf" \
|
||||||
--state present
|
--state present
|
||||||
|
|
||||||
require="__line/rm_slapd_services" __line add_slapd_services \
|
require="__line/rm_slapd_services" __line add_slapd_services \
|
||||||
|
|
Loading…
Reference in a new issue