saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix SC2046 - Quote to prevent word splitting

Browse source 
Replaced `ls` with `find` to better handle non-alphanumeric filenames [SC2012]
This commit is contained in:
Pedro Algarvio 2014-06-22 11:06:31 +01:00
parent 88f62ae603
commit 1795134f03
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bootstrap-salt.sh
View file

@ -702,11 +702,11 @@ __gather_linux_system_info() {
fi
# shellcheck disable=SC2086
for rsource in $(__sort_release_files $(
for rsource in $(__sort_release_files "$(
cd /etc && /bin/ls *[_-]release *[_-]version 2>/dev/null | env -i sort | \
sed -e '/^redhat-release$/d' -e '/^lsb-release$/d'; \
echo redhat-release lsb-release
)); do
)"); do
[ -L "/etc/${rsource}" ] && continue # Don't follow symlinks
[ ! -f "/etc/${rsource}" ] && continue # Does not exist
@ -750,8 +750,8 @@ __gather_linux_system_info() {
done < "/etc/${rsource}"
;;
os )
nn="$(__unquote_string $(grep '^ID=' /etc/os-release | sed -e 's/^ID=\(.*\)$/\1/g'))"
rv="$(__unquote_string $(grep '^VERSION_ID=' /etc/os-release | sed -e 's/^VERSION_ID=\(.*\)$/\1/g'))"
nn="$(__unquote_string "$(grep '^ID=' /etc/os-release | sed -e 's/^ID=\(.*\)$/\1/g')")"
rv="$(__unquote_string "$(grep '^VERSION_ID=' /etc/os-release | sed -e 's/^VERSION_ID=\(.*\)$/\1/g')")"
[ "${rv}" != "" ] && v=$(__parse_version_string "$rv") || v=""
case $(echo "${nn}" | tr '[:upper:]' '[:lower:]') in
arch )
@ -1468,7 +1468,7 @@ __check_services_debian() {
servicename=$1
echodebug "Checking if service ${servicename} is enabled"
# shellcheck disable=SC2086
# shellcheck disable=SC2086,SC2046
if [ -f /etc/rc$(runlevel | awk '{ print $2 }').d/S*${servicename} ]; then
echodebug "Service ${servicename} is enabled"
return 0
@ -4179,7 +4179,7 @@ config_salt() {
preseed_master() {
# Create the PKI directory
if [ $(ls "$_TEMP_KEYS_DIR" | wc -l) -lt 1 ]; then
if [ "$(find "$_TEMP_KEYS_DIR" -maxdepth 1 -type f | wc -l)" -lt 1 ]; then
echoerror "No minion keys were uploaded. Unable to pre-seed master"
return 1
fi