kjg/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix SC1117.

Browse source
This commit is contained in:
Darko Poljak 2018-10-06 13:41:09 +02:00
parent 83806e767a
commit a9f27beb98
10 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cdist/conf/type/__cron/gencode-remote
View file

@ -58,7 +58,7 @@ state_should="$(cat "$__object/parameter/state" 2>/dev/null || echo "present")"
# These are the old markers # These are the old markers
prefix="#cdist:__cron/$__object_id" prefix="#cdist:__cron/$__object_id"
suffix="#/cdist:__cron/$__object_id" suffix="#/cdist:__cron/$__object_id"
filter="^# DO NOT EDIT THIS FILE|^# \(.* installed on |^# \(Cron version V|^# \(Cronie version .\..\)$" filter="^# DO NOT EDIT THIS FILE|^# \\(.* installed on |^# \\(Cron version V|^# \\(Cronie version .\\..\\)$"
cat << DONE cat << DONE
crontab -u $user -l 2>/dev/null | grep -v -E "$filter" | awk -v prefix="$prefix" -v suffix="$suffix" ' crontab -u $user -l 2>/dev/null | grep -v -E "$filter" | awk -v prefix="$prefix" -v suffix="$suffix" '
{ {

2
cdist/conf/type/__install_coreos/gencode-remote
View file

@ -12,7 +12,7 @@ eof
coreos-install -d "${device}" \ coreos-install -d "${device}" \
\$(if [ -s "\${ignition_file}" ]; then \$(if [ -s "\${ignition_file}" ]; then
printf -- "-i \${ignition_file}\n" printf -- "-i \${ignition_file}\\n"
fi) fi)
rm "\${ignition_file}" rm "\${ignition_file}"

2
cdist/conf/type/__install_reset_disk/gencode-remote
View file

@ -67,5 +67,5 @@ fi
# erase partition table # erase partition table
dd if=/dev/zero of=$disk bs=512 count=1 dd if=/dev/zero of=$disk bs=512 count=1
printf 'w\n' | fdisk -u -c $disk || true printf 'w\\n' | fdisk -u -c $disk || true
DONE DONE

16
cdist/conf/type/__jail_freebsd10/gencode-remote
View file

@ -45,7 +45,7 @@ else
# when $state=present, it's required. Enforce this. # when $state=present, it's required. Enforce this.
if [ "$state" = "present" ]; then if [ "$state" = "present" ]; then
exec >&2 exec >&2
echo "If --state is 'present,' --ip must be given\!" echo "If --state is 'present,' --ip must be given\\!"
exit 1 exit 1
fi fi
fi fi
@ -114,17 +114,17 @@ startJail() {
deleteJail() { deleteJail() {
# Unmount the jail's mountpoints if necessary # Unmount the jail's mountpoints if necessary
cat <<EOF cat <<EOF
output="\$(mount | grep "\/${name}\/dev")" || true output="\$(mount | grep "\\/${name}\\/dev")" || true
if [ -n "\${output}" ]; then # /dev is still mounted...jail still running? if [ -n "\${output}" ]; then # /dev is still mounted...jail still running?
/etc/rc.d/jail stop "${name}" /etc/rc.d/jail stop "${name}"
fi fi
output="\$(mount | grep "\/rw\/${name}\/")" || true output="\$(mount | grep "\\/rw\\/${name}\\/")" || true
if [ -n "\${output}" ]; then # >=1 rw mount is mounted still if [ -n "\${output}" ]; then # >=1 rw mount is mounted still
for DIR in "${output}"; do for DIR in "${output}"; do
umount -F "/etc/fstab.${name}" "\$(echo "${DIR}" | awk '{print \$3}')" umount -F "/etc/fstab.${name}" "\$(echo "${DIR}" | awk '{print \$3}')"
done done
fi fi
output="\$(mount | grep "\/${name} (")" || true output="\$(mount | grep "\\/${name} (")" || true
if [ -n "\${output}" ]; then # ro mount is mounted still if [ -n "\${output}" ]; then # ro mount is mounted still
umount -F "/etc/fstab.${name}" "\$(echo "${output}" | awk '{print \$3}')" umount -F "/etc/fstab.${name}" "\$(echo "${output}" | awk '{print \$3}')"
fi fi
@ -275,9 +275,9 @@ cat <<EOF
if [ ! -f /etc/devfs.rules ]; then if [ ! -f /etc/devfs.rules ]; then
touch /etc/devfs.rules touch /etc/devfs.rules
fi fi
if [ -z "\$(grep '\[jailrules=' /etc/devfs.rules)" ]; then # The default ruleset doesn't exist if [ -z "\$(grep '\\[jailrules=' /etc/devfs.rules)" ]; then # The default ruleset doesn't exist
# Get the highest-numbered ruleset # Get the highest-numbered ruleset
highest="\$(sed -n 's/\[.*=\([0-9]*\)\]/\1/pg' /etc/devfs.rules | sort -u | tail -n 1)" || true highest="\$(sed -n 's/\\[.*=\\([0-9]*\\)\\]/\\1/pg' /etc/devfs.rules | sort -u | tail -n 1)" || true
# increment by 1 # increment by 1
[ -z "\$highest" ] && highest=10 [ -z "\$highest" ] && highest=10
let num="\${highest}+1" 2>&1 >/dev/null # Close the FD==fail... let num="\${highest}+1" 2>&1 >/dev/null # Close the FD==fail...
@ -290,7 +290,7 @@ add include \\\$devfsrules_unhide_basic
add include \\\$devfsrules_unhide_login add include \\\$devfsrules_unhide_login
END END
fi fi
devfsruleset_num=\$(grep "\[${devfsruleset}=" /etc/devfs.rules | sed -n 's/\[.*=\([0-9]*\)\]/\1/pg') devfsruleset_num=\$(grep "\\[${devfsruleset}=" /etc/devfs.rules | sed -n 's/\\[.*=\\([0-9]*\\)\\]/\\1/pg')
if [ -n "\$devfsruleset_num" ]; then if [ -n "\$devfsruleset_num" ]; then
jaildata="\$jaildata jaildata="\$jaildata
devfs_ruleset=\"\${devfsruleset_num}\";" devfs_ruleset=\"\${devfsruleset_num}\";"
@ -299,7 +299,7 @@ END
EOF EOF
# shellcheck disable=SC2028 # shellcheck disable=SC2028
echo "printf \"%s\\n%s\n%s\n\" \"\$jailheader\" \"\$jaildata\" \"\$jailtrailer\" >>\"\$jailfile\"" echo "printf \"%s\\n%s\\n%s\\n\" \"\$jailheader\" \"\$jaildata\" \"\$jailtrailer\" >>\"\$jailfile\""
# Add $name to jail_list if $onboot=yes # Add $name to jail_list if $onboot=yes
if [ "$onboot" = "yes" ]; then if [ "$onboot" = "yes" ]; then

12
cdist/conf/type/__jail_freebsd9/gencode-remote
View file

@ -45,7 +45,7 @@ else
# when $state=present, it's required. Enforce this. # when $state=present, it's required. Enforce this.
if [ "$state" = "present" ]; then if [ "$state" = "present" ]; then
exec >&2 exec >&2
echo "If --state is 'present,' --ip must be given\!" echo "If --state is 'present,' --ip must be given\\!"
exit 1 exit 1
fi fi
fi fi
@ -119,17 +119,17 @@ startJail() {
deleteJail() { deleteJail() {
# Unmount the jail's mountpoints if necessary # Unmount the jail's mountpoints if necessary
cat <<EOF cat <<EOF
output="\$(mount | grep "\/${name}\/dev")" || true output="\$(mount | grep "\\/${name}\\/dev")" || true
if [ -n "\${output}" ]; then # /dev is still mounted...jail still running? if [ -n "\${output}" ]; then # /dev is still mounted...jail still running?
/etc/rc.d/jail stop "${name}" /etc/rc.d/jail stop "${name}"
fi fi
output="\$(mount | grep "\/rw\/${name}\/")" || true output="\$(mount | grep "\\/rw\\/${name}\\/")" || true
if [ -n "\${output}" ]; then # >=1 rw mount is mounted still if [ -n "\${output}" ]; then # >=1 rw mount is mounted still
for DIR in "${output}"; do for DIR in "${output}"; do
umount -F "/etc/fstab.${name}" "\$(echo "${DIR}" | awk '{print \$3}')" umount -F "/etc/fstab.${name}" "\$(echo "${DIR}" | awk '{print \$3}')"
done done
fi fi
output="\$(mount | grep "\/${name} (")" || true output="\$(mount | grep "\\/${name} (")" || true
if [ -n "\${output}" ]; then # ro mount is mounted still if [ -n "\${output}" ]; then # ro mount is mounted still
umount -F "/etc/fstab.${name}" "\$(echo "${output}" | awk '{print \$3}')" umount -F "/etc/fstab.${name}" "\$(echo "${output}" | awk '{print \$3}')"
fi fi
@ -279,9 +279,9 @@ END
if [ ! -f /etc/devfs.rules ]; then if [ ! -f /etc/devfs.rules ]; then
touch /etc/devfs.rules touch /etc/devfs.rules
fi fi
if [ -z "\$(grep '\[jailrules=' /etc/devfs.rules)" ]; then # The default ruleset doesn't exist if [ -z "\$(grep '\\[jailrules=' /etc/devfs.rules)" ]; then # The default ruleset doesn't exist
# Get the highest-numbered ruleset # Get the highest-numbered ruleset
highest="\$(sed -n 's/\[.*=\([0-9]*\)\]/\1/pg' /etc/devfs.rules | sort -u | tail -n 1)" || true highest="\$(sed -n 's/\\[.*=\\([0-9]*\\)\\]/\\1/pg' /etc/devfs.rules | sort -u | tail -n 1)" || true
# increment by 1 # increment by 1
let num="\${highest}+1" 2>&- >&- let num="\${highest}+1" 2>&- >&-
# add default ruleset # add default ruleset

2
cdist/conf/type/__mount/gencode-remote
View file

@ -39,7 +39,7 @@ case "$state_should" in
printf ' -o %s' "$(cat "$__object/parameter/options")" printf ' -o %s' "$(cat "$__object/parameter/options")"
fi fi
printf ' %s' "$(cat "$__object/parameter/device")" printf ' %s' "$(cat "$__object/parameter/device")"
printf " %s\n" "$path" printf " %s\\n" "$path"
else else
# mount using existing fstab entry # mount using existing fstab entry
printf 'mount "%s"\n' "$path" printf 'mount "%s"\n' "$path"

2
cdist/conf/type/__package_pkgng_freebsd/gencode-remote
View file

@ -95,7 +95,7 @@ if [ -n "$curr_version" ]; then # PKG *is* installed
if [ "$upgrade" = "true" ]; then if [ "$upgrade" = "true" ]; then
execcmd "upg" "${cmd}" execcmd "upg" "${cmd}"
else else
printf "Version %s is already installed and pkg-ng can't upgrade directly to version %s.\nTo upgrade to the latest version, use the --upgrade flag.\n" "$curr_version" "$version" >&2 printf "Version %s is already installed and pkg-ng can't upgrade directly to version %s.\\nTo upgrade to the latest version, use the --upgrade flag.\\n" "$curr_version" "$version" >&2
exit 1 exit 1
fi fi
# PKG is supposed to be installed to the latest version # PKG is supposed to be installed to the latest version

2
cdist/conf/type/__rvm/gencode-remote
View file

@ -34,7 +34,7 @@ DONE
absent) absent)
cat << DONE cat << DONE
su - $user -c "rm -Rf \"\\\$HOME/.rvm\"; su - $user -c "rm -Rf \"\\\$HOME/.rvm\";
sed '/rvm\/scripts\/rvm/d' \"\\\$HOME/.bashrc\" > \"\\\$HOME/.bashrc.cdist-tmp\" sed '/rvm\\/scripts\\/rvm/d' \"\\\$HOME/.bashrc\" > \"\\\$HOME/.bashrc.cdist-tmp\"
mv \"\\\$HOME/.bashrc.cdist-tmp\" \"\\\$HOME/.bashrc\"" mv \"\\\$HOME/.bashrc.cdist-tmp\" \"\\\$HOME/.bashrc\""
DONE DONE
;; ;;

2
cdist/conf/type/__ssh_authorized_key/gencode-remote
View file

@ -48,7 +48,7 @@ add_line() {
line="$2" line="$2"
# escape single quotes # escape single quotes
line_sanitised=$(echo "$line" | sed -e "s/'/'\"'\"'/g") line_sanitised=$(echo "$line" | sed -e "s/'/'\"'\"'/g")
printf '%s' "printf '%s\n' '$line_sanitised' >> $file" printf '%s' "printf '%s\\n' '$line_sanitised' >> $file"
} }

4
cdist/conf/type/__staged_file/gencode-local
View file

@ -67,10 +67,10 @@ fetch_and_prepare_file() {
# shellcheck disable=SC2016 # shellcheck disable=SC2016
printf 'cd "$tmpdir"\n' printf 'cd "$tmpdir"\n'
# shellcheck disable=SC2059 # shellcheck disable=SC2059
printf "$fetch_command > \"%s\"\n" "$source" "$source_file_name" printf "$fetch_command > \"%s\"\\n" "$source" "$source_file_name"
prepare_command="$(cat "$__object/parameter/prepare-command")" prepare_command="$(cat "$__object/parameter/prepare-command")"
# shellcheck disable=SC2059 # shellcheck disable=SC2059
printf "$prepare_command > \"%s\"\n" "$source_file_name" "$stage_file" printf "$prepare_command > \"%s\"\\n" "$source_file_name" "$stage_file"
printf 'cd - >/dev/null\n' printf 'cd - >/dev/null\n'
# shellcheck disable=SC2016 # shellcheck disable=SC2016
printf 'rm -rf "$tmpdir"\n' printf 'rm -rf "$tmpdir"\n'