forked from ungleich-public/cdist
++cleanups
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
5359ed863c
commit
7d0877d8ce
5 changed files with 9 additions and 8 deletions
|
@ -29,10 +29,7 @@ set -eu
|
||||||
__cdist_target_host="$1"; shift
|
__cdist_target_host="$1"; shift
|
||||||
__cdist_object="$1"; shift
|
__cdist_object="$1"; shift
|
||||||
|
|
||||||
# Full path to current object
|
|
||||||
__cdist_cur_object_dir="$(__cdist_object_dir "$__cdist_object")"
|
__cdist_cur_object_dir="$(__cdist_object_dir "$__cdist_object")"
|
||||||
|
|
||||||
# Only the id
|
|
||||||
__cdist_object_id="$(__cdist_object_id_from_object "$__cdist_object")"
|
__cdist_object_id="$(__cdist_object_id_from_object "$__cdist_object")"
|
||||||
|
|
||||||
echo "Checking manifest for $__cdist_object ..."
|
echo "Checking manifest for $__cdist_object ..."
|
||||||
|
|
|
@ -41,8 +41,7 @@ export $__cdist_name_var_self=$__cdist_object
|
||||||
|
|
||||||
__cdist_object_finished="$(__cdist_object_finished "$__cdist_object")"
|
__cdist_object_finished="$(__cdist_object_finished "$__cdist_object")"
|
||||||
if [ ! -f "$__cdist_object_finished" ]; then
|
if [ ! -f "$__cdist_object_finished" ]; then
|
||||||
|
# Resolve dependencies, if any
|
||||||
# Resolve dependencies if any
|
|
||||||
__cdist_object_require="$(__cdist_object_require "$__cdist_object")"
|
__cdist_object_require="$(__cdist_object_require "$__cdist_object")"
|
||||||
if [ -f "$__cdist_object_require" ]; then
|
if [ -f "$__cdist_object_require" ]; then
|
||||||
echo
|
echo
|
||||||
|
|
|
@ -53,7 +53,6 @@ if [ "$(echo $__cdist_object_id | grep "^/")" ]; then
|
||||||
else
|
else
|
||||||
__cdist_object_self="${__cdist_type}/${__cdist_object_id}"
|
__cdist_object_self="${__cdist_type}/${__cdist_object_id}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Internal quirks
|
# Internal quirks
|
||||||
#
|
#
|
||||||
|
|
|
@ -27,7 +27,6 @@ set -eu
|
||||||
|
|
||||||
__cdist_type="$1"; shift
|
__cdist_type="$1"; shift
|
||||||
|
|
||||||
|
|
||||||
# Base
|
# Base
|
||||||
mkdir -p "$(__cdist_type_dir "$__cdist_type")"
|
mkdir -p "$(__cdist_type_dir "$__cdist_type")"
|
||||||
|
|
||||||
|
|
|
@ -6,10 +6,11 @@ Feel free to pick one!
|
||||||
CORE
|
CORE
|
||||||
----
|
----
|
||||||
- Only build manpages if necessary for types as well as for the core!
|
- Only build manpages if necessary for types as well as for the core!
|
||||||
- Add echo function:
|
- Add echo function / beautify output
|
||||||
__cdist_echo [level] [messages...]
|
__cdist_echo [level] [messages...]
|
||||||
level := syslog alike:
|
level := syslog alike:
|
||||||
debug, notice, err
|
debug, notice, err
|
||||||
|
Include object_self prefixing, if given!
|
||||||
- Think about moving cdist-type-build-emulation out of cdist-manifest-run to
|
- Think about moving cdist-type-build-emulation out of cdist-manifest-run to
|
||||||
cdist-deploy-to: more dependency of cdist-manifest-run, but a lot of
|
cdist-deploy-to: more dependency of cdist-manifest-run, but a lot of
|
||||||
less cycles consumed
|
less cycles consumed
|
||||||
|
@ -17,6 +18,12 @@ CORE
|
||||||
- cdist-object-gencode: remove code if output empty?
|
- cdist-object-gencode: remove code if output empty?
|
||||||
- also take care of that in cdist-code-run!
|
- also take care of that in cdist-code-run!
|
||||||
- cdist-object-process -> cdist-object-prepare
|
- cdist-object-process -> cdist-object-prepare
|
||||||
|
- Remove cdist-object-push, covers only one line and is used only once:
|
||||||
|
[20:22] kr:bin% grep cdist-object-push *
|
||||||
|
cdist-object-run: cdist-object-push "$__cdist_target_host" "$__cdist_object"
|
||||||
|
[20:22] kr:bin%
|
||||||
|
|
||||||
|
- probably remove or improve cdist-type-template
|
||||||
|
|
||||||
TYPES
|
TYPES
|
||||||
------
|
------
|
||||||
|
|
Loading…
Reference in a new issue