From 94d85dac63946b615653d465b9a17595e64fa6ac Mon Sep 17 00:00:00 2001
From: Alain Reguera Delgado <alain.reguera@gmail.com>
Date: Nov 26 2010 11:06:59 +0000
Subject: Update cli_getActions.sh to replace ACTION, ACTIONDIR, ACTIONFILES,

ACTIONSCRIPT, ACTIONFUN variables to FUNCNAM, FUNCNAMDIR,
FUNCNAMFILES, FUNCNAMESCRIPT, FUNCNAMCALL respectively.


---

diff --git a/Scripts/Bash/Functions/cli_getActions.sh b/Scripts/Bash/Functions/cli_getActions.sh
index 835f3e6..fc141ec 100644
--- a/Scripts/Bash/Functions/cli_getActions.sh
+++ b/Scripts/Bash/Functions/cli_getActions.sh
@@ -27,10 +27,10 @@
 function cli_getActions {
 
     # Define variables as local to avoid conflicts outside.
-    local ACTIONDIR=''
-    local ACTIONFILES=''
-    local ACTIONSCRIPT=''
-    local ACTIONFUN=''
+    local FUNCNAMDIR=''
+    local FUNCNAMFILES=''
+    local FUNCNAMSCRIPT=''
+    local FUNCNAMCALL=''
     local REPOFUNDIR=''
 
     # Define path to directory where actions are stored inside the
@@ -38,21 +38,21 @@ function cli_getActions {
     REPOFUNDIR=/home/centos/artwork/trunk/Scripts/Bash/Functions
 
     # Define action directory. 
-    ACTIONDIR=$(cli_getRepoName $ACTION 'd')
+    FUNCNAMDIR=$(cli_getRepoName $FUNCNAM 'd')
 
     # Define action file name.
-    ACTIONSCRIPT=${REPOFUNDIR}/${ACTIONDIR}/${ACTION}.sh
+    FUNCNAMSCRIPT=${REPOFUNDIR}/${FUNCNAMDIR}/${FUNCNAM}.sh
 
     # Check action existence.
-    if [[ ! -f $ACTIONSCRIPT ]];then
+    if [[ ! -f $FUNCNAMSCRIPT ]];then
         cli_printMessage "`gettext "The action provided is not valid."`"
         cli_printMessage "$(caller)" "AsToKnowMoreLine"
     fi
 
     # Build action-specifc script file list.
-    ACTIONFILES=$(ls ${REPOFUNDIR}/${ACTIONDIR}/${ACTION}*.sh)
+    FUNCNAMFILES=$(ls ${REPOFUNDIR}/${FUNCNAMDIR}/${FUNCNAM}*.sh)
 
-    for FILE in $ACTIONFILES;do
+    for FILE in $FUNCNAMFILES;do
 
         if [[ -x ${FILE} ]];then
 
@@ -61,8 +61,8 @@ function cli_getActions {
 
             # Export action-specific functions to current shell script
             # environment.
-            ACTIONFUN=$(grep '^function ' $FILE | cut -d' ' -f2)
-            export -f $ACTIONFUN
+            FUNCNAMCALL=$(grep '^function ' $FILE | cut -d' ' -f2)
+            export -f $FUNCNAMCALL
 
         else
 
@@ -74,6 +74,6 @@ function cli_getActions {
     done
 
     # Execute action passed to centos-art.sh script.
-    eval $ACTION
+    eval $FUNCNAM
 
 }