From ce69491c34be0a6611352986547e4271d8a20527 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Wed, 23 Feb 2011 10:12:26 +0100
Subject: [PATCH] sed -i 's/__cdist_name_type_params/__cdist_name_params/g'

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 bin/cdist-config       | 8 ++++----
 bin/cdist_tree_wrapper | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/cdist-config b/bin/cdist-config
index e2580a00..725a3c98 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -44,9 +44,9 @@ set -u
 : ${__cdist_name_object:=objects}
 
 : ${__cdist_name_type:=types}
-: ${__cdist_name_type_params:=parameters}
-: ${__cdist_name_type_params_required:=required}
-: ${__cdist_name_type_params_optional:=optional}
+: ${__cdist_name_params:=parameters}
+: ${__cdist_name_params_required:=required}
+: ${__cdist_name_params_optional:=optional}
 
 # Name of the executable generated
 : ${__cdist_name_exec:=exec}
@@ -152,7 +152,7 @@ __cdist_type_param_file()
    local type="$1"; shift
    local paramtype="$1"; shift
 
-   echo "${__cdist_type_dir}/$type/$__cdist_name_type_params/$paramtype"
+   echo "${__cdist_type_dir}/$type/$__cdist_name_params/$paramtype"
 }
 
 __cdist_type_from_object()
diff --git a/bin/cdist_tree_wrapper b/bin/cdist_tree_wrapper
index c5a179f3..eac4e72a 100755
--- a/bin/cdist_tree_wrapper
+++ b/bin/cdist_tree_wrapper
@@ -51,7 +51,7 @@ mkdir -p "${__cdist_ddir}"
 echo "${__cdist_manifest}" > "${__cdist_ddir}/${__cdist_name_object_source}"
 
 # Record parameters to subdir
-tempparams="${__cdist_tmp_dir}/${__cdist_name_type_params}"
+tempparams="${__cdist_tmp_dir}/${__cdist_name_params}"
 mkdir -p "$tempparams"
 
 while [ $# -gt 0 ]; do
@@ -76,14 +76,14 @@ while read required; do
    fi
 
    mv "${tempparams}/${required}" "${__cdist_ddir}"
-done < "$(__cdist_type_param_file "$__cdist_type" "$__cdist_name_type_params_required")"
+done < "$(__cdist_type_param_file "$__cdist_type" "$__cdist_name_params_required")"
 
 # Allow optional parameters
 while read optional; do
    if [ -f "${tempparams}/${optional}" ]; then
       mv "${tempparams}/${optional}" "${__cdist_ddir}"
    fi
-done < "$(__cdist_type_param_file "$__cdist_type" "$__cdist_name_type_params_optional")"
+done < "$(__cdist_type_param_file "$__cdist_type" "$__cdist_name_params_optional")"
 
 # Error out on other paramaters
 cd "${tempparams}"