Merge branch 'master' into 2.1

This commit is contained in:
Nico Schottelius 2012-09-21 11:09:26 +02:00
commit 3140c009d3
4 changed files with 40 additions and 72 deletions

View file

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

View file

@ -1,6 +1,6 @@
#!/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.
#
@ -18,31 +18,22 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
#
# Check state and exit if nothing needs to be done
state_should="present"
[ -f "$__object/parameter/state" ] && state_should="$(cat "$__object/parameter/state")"
state_is="$(cat "$__object/explorer/state")"
[ "$state_should" = "$state_is" ] && exit 0
destination="/$__object_id"
state_should="$(cat "$__object/parameter/state")"
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
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\"
fi
# Mode settings
if [ -f "$__object/parameter/mode" ]; then
@ -60,11 +51,7 @@ case "$state_should" in
fi
;;
absent)
# Only delete if it exists
if [ yes = "$(cat "$__object/explorer/exists")" ]; then
echo rm -rf \"$destination\"
fi
;;
*)
echo "Unknown state: $state_should" >&2

View file

@ -1,23 +0,0 @@
#!/bin/sh
#
# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
#
# This file is part of cdist.
#
# cdist is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# cdist is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
#
# set defaults
state="$(cat "$__object/parameter/state" 2>/dev/null \
|| echo "present" | tee "$__object/parameter/state")"

View file

@ -0,0 +1,4 @@
Known bug rediscovered:
Explorer for __start_on_boot mysql runs before __package mysql was finished.
Requires two runs to actually finish the task.