From fe159eccb2946a85c1b0654a5258c3f45f5c31d5 Mon Sep 17 00:00:00 2001 From: Steven Armstrong Date: Tue, 29 Mar 2011 21:47:05 +0200 Subject: [PATCH] prefix all variables with __cdist Signed-off-by: Steven Armstrong --- bin/cdist-code-run | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/cdist-code-run b/bin/cdist-code-run index e969d942..db1a2378 100755 --- a/bin/cdist-code-run +++ b/bin/cdist-code-run @@ -25,22 +25,22 @@ [ $# -eq 2 ] || __cdist_usage " " set -ue -object="$1"; shift +__cdist_object="$1"; shift __cdist_gencode_type="$1"; shift -if [ ! -d "$(__cdist_object_dir "$object")" ]; then - __cdist_exit_err "Object $object is missing." +if [ ! -d "$(__cdist_object_dir "$__cdist_object")" ]; then + __cdist_exit_err "Object $__cdist_object is missing." fi -code="$(__cdist_object_code "$object")-${__cdist_gencode_type}" +code="$(__cdist_object_code "$__cdist_object")-${__cdist_gencode_type}" -echo "Checking code-${__cdist_gencode_type} for $object ..." +echo "Checking code-${__cdist_gencode_type} for $__cdist_object ..." if [ -e "$code" ]; then if [ -f "$code" ]; then if [ -x "$code" ]; then - echo "Executing code-${__cdist_gencode_type} for $object ..." + echo "Executing code-${__cdist_gencode_type} for $__cdist_object ..." "$code" else __cdist_exit_err "$code exists, but is not executable." @@ -49,5 +49,5 @@ if [ -e "$code" ]; then __cdist_exit_err "$code exists, but is not a file." fi else - __cdist_exit_err "Missing code for ${object}." + __cdist_exit_err "Missing code for ${__cdist_object}." fi