cleanup gencode-remote

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-09-21 11:03:53 +02:00
parent 1e765d7e77
commit 30323456bf
2 changed files with 33 additions and 48 deletions
conf/type/__directory

View file

@ -24,7 +24,7 @@
destination="/$__object_id" destination="/$__object_id"
if [ -e "$destination" ]; then if [ -e "$destination" ]; then
echo yes echo present
else else
echo no echo absent
fi fi

View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# 2011 Nico Schottelius (nico-cdist at schottelius.org) # 2011-2012 Nico Schottelius (nico-cdist at schottelius.org)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -20,29 +20,18 @@
destination="/$__object_id" destination="/$__object_id"
state_should="$(cat "$__object/parameter/state")" state_should="$(cat "$__object/parameter/state")"
state_is="$(cat "$__object/explorer/state")"
[ "$state_should" = "$state_is" ] && exit 0
mkdiropt=""
grep yes "$__object/parameter/parents" >/dev/null 2>&1 && mkdiropt="-p"
recursive=""
grep yes "$__object/parameter/recursive" >/dev/null 2>&1 && recursive="-R"
case "$state_should" in case "$state_should" in
present) present)
# Include parent directories?
if [ -f "$__object/parameter/parents" ]; then
parents="$(cat "$__object/parameter/parents")"
if [ yes = "$parents" ]; then
mkdiropt="-p"
else
mkdiropt=""
fi
fi
if [ -f "$__object/parameter/recursive" ]; then
if [ yes = "$(cat "$__object/parameter/recursive")" ]; then
recursive="-R"
fi
fi
# Only create if not already existent
if [ no = "$(cat "$__object/explorer/exists")" ]; then
echo mkdir $mkdiropt \"$destination\" echo mkdir $mkdiropt \"$destination\"
fi
# Mode settings # Mode settings
if [ -f "$__object/parameter/mode" ]; then if [ -f "$__object/parameter/mode" ]; then
@ -60,11 +49,7 @@ case "$state_should" in
fi fi
;; ;;
absent) absent)
# Only delete if it exists
if [ yes = "$(cat "$__object/explorer/exists")" ]; then
echo rm -rf \"$destination\" echo rm -rf \"$destination\"
fi
;; ;;
*) *)
echo "Unknown state: $state_should" >&2 echo "Unknown state: $state_should" >&2