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

Better fixes.

Browse source
This commit is contained in:
Darko Poljak 2018-10-07 09:59:01 +02:00
parent a78baccc82
commit e9b823bc39
5 changed files with 5 additions and 5 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/__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\\!" printf 'If --state is "present", --ip must be given\!\n'
exit 1 exit 1
fi fi
fi fi

2
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\\!" printf 'If --state is "present", --ip must be given\!\n'
exit 1 exit 1
fi fi
fi fi

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 cannot 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