implement $__self

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-03-29 15:27:17 +02:00
parent 801d2be3d2
commit 32392d129a
3 changed files with 5 additions and 0 deletions

View file

@ -63,6 +63,7 @@ __cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
: ${__cdist_name_parameter_required:=required} : ${__cdist_name_parameter_required:=required}
: ${__cdist_name_parameter_optional:=optional} : ${__cdist_name_parameter_optional:=optional}
: ${__cdist_name_require:=require} : ${__cdist_name_require:=require}
: ${__cdist_name_self:=self}
: ${__cdist_name_singleton:=singleton} : ${__cdist_name_singleton:=singleton}
: ${__cdist_name_target_host:=target_host} : ${__cdist_name_target_host:=target_host}
: ${__cdist_name_target_user:=target_user} : ${__cdist_name_target_user:=target_user}
@ -89,6 +90,7 @@ __cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
: ${__cdist_name_var_target_user:=__$__cdist_name_target_user} : ${__cdist_name_var_target_user:=__$__cdist_name_target_user}
: ${__cdist_name_var_object:=__$__cdist_name_object} : ${__cdist_name_var_object:=__$__cdist_name_object}
: ${__cdist_name_var_object_id:=__$__cdist_name_object_id} : ${__cdist_name_var_object_id:=__$__cdist_name_object_id}
: ${__cdist_name_var_self:=__$__cdist_name_self}
: ${__cdist_name_var_type:=__$__cdist_name_type} : ${__cdist_name_var_type:=__$__cdist_name_type}

View file

@ -55,6 +55,7 @@ if [ "$__cdist_has_explorer" ]; then
cdist-run-remote "$__cdist_target_host" \ cdist-run-remote "$__cdist_target_host" \
"__object=\"$(__cdist_remote_object_dir "$__object")\"" \ "__object=\"$(__cdist_remote_object_dir "$__object")\"" \
"__object_id=\"$__object_id\"" \ "__object_id=\"$__object_id\"" \
"$__cdist_name_var_self=\"$__cdist_object\"" \
cdist-remote-explorer-run \ cdist-remote-explorer-run \
"$__cdist_name_var_type_explorer" \ "$__cdist_name_var_type_explorer" \
"$(__cdist_remote_type_explorer_dir "$__cdist_type")" \ "$(__cdist_remote_type_explorer_dir "$__cdist_type")" \

View file

@ -33,6 +33,8 @@ set -eu
__cdist_target_host="$1"; shift __cdist_target_host="$1"; shift
__cdist_object="$1"; shift __cdist_object="$1"; shift
# Export to non-core for use in manifest and gencode scripts
export $__cdist_name_var_self=$__cdist_object
__cdist_type="$(__cdist_type_from_object "$__cdist_object")" __cdist_type="$(__cdist_type_from_object "$__cdist_object")"