sort object area in cdist-config

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
remotes/origin/1.4
Nico Schottelius 14 years ago
parent 359e252ef7
commit 6f67911a0b
  1. 43
      bin/cdist-config

@ -190,6 +190,18 @@ __cdist_object_code_finished()
echo "$(__cdist_object_dir "$1")/${__cdist_name_code_finished}"
}
__cdist_object_dir()
{
__cdist_object_dir="${__cdist_out_object_dir}/$1/${__cdist_name_dot_cdist}"
echo "$__cdist_object_dir"
}
__cdist_object_id_from_object()
{
echo "${1#*/}"
}
# Find objects, remove ./ and /MARKER
__cdist_object_list()
{
@ -205,42 +217,24 @@ __cdist_object_list()
}
__cdist_object_source()
{
local object_dir="$1"; shift
cat "${object_dir}/${__cdist_name_object_source}"
}
__cdist_object_parameter_dir()
{
echo "$(__cdist_object_dir "$1")/${__cdist_name_parameter}"
}
__cdist_remote_object_parameter_dir()
{
echo "$(__cdist_remote_object_dir "$1")/${__cdist_name_parameter}"
}
__cdist_object_require()
{
echo "$(__cdist_object_dir "$1")/${__cdist_name_require}"
}
__cdist_object_type_explorer_dir()
{
echo "$(__cdist_object_dir "$1")/${__cdist_name_explorer}"
}
__cdist_object_id_from_object()
__cdist_object_source()
{
echo "${1#*/}"
cat "$1/${__cdist_name_object_source}"
}
__cdist_object_dir()
__cdist_object_type_explorer_dir()
{
__cdist_object_dir="${__cdist_out_object_dir}/$1/${__cdist_name_dot_cdist}"
echo "$__cdist_object_dir"
echo "$(__cdist_object_dir "$1")/${__cdist_name_explorer}"
}
################################################################################
@ -252,6 +246,11 @@ __cdist_remote_object_dir()
echo "${__cdist_remote_out_object_base_dir}/$1"
}
__cdist_remote_object_parameter_dir()
{
echo "$(__cdist_remote_object_dir "$1")/${__cdist_name_parameter}"
}
__cdist_remote_object_type_explorer_dir()
{
echo "$(__cdist_remote_object_dir "$1")/${__cdist_name_explorer}"

Loading…
Cancel
Save