find conf/type -type f -exec sed -i 's/ *$//' {} \;

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-01-09 16:30:52 +01:00
parent 5bcb807ebd
commit 3818548d9a
15 changed files with 18 additions and 18 deletions

View file

@ -17,7 +17,7 @@ REQUIRED PARAMETERS
------------------- -------------------
state:: state::
The state the ppa should be in, either "enabled" or "disabled". The state the ppa should be in, either "enabled" or "disabled".
OPTIONAL PARAMETERS OPTIONAL PARAMETERS
------------------- -------------------

View file

@ -65,8 +65,8 @@ case "$state_should" in
echo rm -rf \"$destination\" echo rm -rf \"$destination\"
fi fi
;; ;;
*) *)
echo "Unknown state: $state_should" >&2 echo "Unknown state: $state_should" >&2
exit 1 exit 1
;; ;;

View file

@ -33,7 +33,7 @@ case "$state_should" in
echo touch \"$destination\" echo touch \"$destination\"
fi fi
fi fi
# Mode settings # Mode settings
if [ -f "$__object/parameter/mode" ]; then if [ -f "$__object/parameter/mode" ]; then
echo chmod \"$(cat "$__object/parameter/mode")\" \"$destination\" echo chmod \"$(cat "$__object/parameter/mode")\" \"$destination\"
@ -55,7 +55,7 @@ case "$state_should" in
if [ "$exists" = "yes" ]; then if [ "$exists" = "yes" ]; then
echo rm -f \"$destination\" echo rm -f \"$destination\"
fi fi
;; ;;
*) *)

View file

@ -10,7 +10,7 @@ cdist-type__file - Manage files
DESCRIPTION DESCRIPTION
----------- -----------
This cdist type allows you to create files, remove files and set file This cdist type allows you to create files, remove files and set file
attributes on the target. attributes on the target.

View file

@ -47,7 +47,7 @@ if grep -q "^${name}:" "$__object/explorer/group"; then
echo groupmod "$@" "$name" echo groupmod "$@" "$name"
else else
true true
fi fi
else else
for property in $(ls .); do for property in $(ls .); do
new_value="$(cat "$property")" new_value="$(cat "$property")"

View file

@ -37,7 +37,7 @@ if [ "$value_is" != "$value_should" ]; then
cat << DONE cat << DONE
sed -i '/^${key}/d' "$file" sed -i '/^${key}/d' "$file"
DONE DONE
else else
# change value # change value
cat << DONE cat << DONE
awk -F "$delimiter" ' awk -F "$delimiter" '

View file

@ -35,7 +35,7 @@ EXAMPLES
-------- --------
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
# Set the maximum system user id # Set the maximum system user id
__key_value SYS_UID_MAX --file /etc/login.defs --value 666 --delimiter ' ' __key_value SYS_UID_MAX --file /etc/login.defs --value 666 --delimiter ' '
# Same with fancy id # Same with fancy id

View file

@ -26,7 +26,7 @@ name::
The name of the package to install. Default is to use the object_id as the The name of the package to install. Default is to use the object_id as the
package name. package name.
version:: version::
The version of the package to install. Default is to install the version The version of the package to install. Default is to install the version
choosen by the local package manager. choosen by the local package manager.
type:: type::
The package type to use. Default is determined based on the $os explorer The package type to use. Default is determined based on the $os explorer

View file

@ -78,7 +78,7 @@ eof
eof eof
fi fi
;; ;;
*) *)
echo "Unknown state: $state" >&2 echo "Unknown state: $state" >&2
exit 1 exit 1
;; ;;

View file

@ -5,7 +5,7 @@ Andi Brönnimann <andi-cdist--@--v-net.ch>
NAME NAME
---- ----
cdist-type__package_pkg_openbsd - Manage OpenBSD packages cdist-type__package_pkg_openbsd - Manage OpenBSD packages
DESCRIPTION DESCRIPTION

View file

@ -77,7 +77,7 @@ for object in $objects; do
debug "current_device=$current_device" debug "current_device=$current_device"
debug "available_device_size=$available_device_size" debug "available_device_size=$available_device_size"
fi fi
type="$(cat "$object/parameter/type")" type="$(cat "$object/parameter/type")"
partition="$(cat "$object/parameter/partition")" partition="$(cat "$object/parameter/partition")"
minor="$(cat "$object/parameter/minor")" minor="$(cat "$object/parameter/minor")"

View file

@ -21,7 +21,7 @@ state::
OPTIONAL PARAMETERS OPTIONAL PARAMETERS
------------------- -------------------
All optional parameter map directly to the corresponding postgres createrole All optional parameter map directly to the corresponding postgres createrole
parameters. parameters.
password:: password::
@ -36,7 +36,7 @@ EXAMPLES
-------- --------
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
__postgres_role myrole --state present __postgres_role myrole --state present
__postgres_role myrole --state present --password 'secret' __postgres_role myrole --state present --password 'secret'

View file

@ -10,7 +10,7 @@ cdist-type__timezone - Allows to configure the desired localtime timezone.
DESCRIPTION DESCRIPTION
----------- -----------
This type creates a symlink (/etc/localtime) to the selected timezone This type creates a symlink (/etc/localtime) to the selected timezone
(which should be available in /usr/share/zoneinfo). (which should be available in /usr/share/zoneinfo).

View file

@ -24,5 +24,5 @@
if [ -f "$__object/parameter/gid" ]; then if [ -f "$__object/parameter/gid" ]; then
gid=$(cat "$__object/parameter/gid") gid=$(cat "$__object/parameter/gid")
getent group "$gid" || true getent group "$gid" || true
fi fi

View file

@ -42,7 +42,7 @@ if grep -q "^${name}:" "$__object/explorer/passwd"; then
fi fi
;; ;;
password) password)
field=3 field=3
file="$__object/explorer/shadow" file="$__object/explorer/shadow"
;; ;;
comment) field=5 ;; comment) field=5 ;;