make variables local
This commit is contained in:
parent
c560db95b2
commit
885ee46519
|
@ -69,11 +69,11 @@ function loadLibraries() {
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
function logMessage() {
|
function logMessage() {
|
||||||
if isEnabled ${LOGGING}; then
|
if isEnabled ${LOGGING}; then
|
||||||
MESSAGE="${1}"
|
local MESSAGE="${1}"
|
||||||
TYPE="${2}"
|
local TYPE="${2}"
|
||||||
DATE=$(date +"${LOGDATEFORMAT}")
|
local DATE=$(date +"${LOGDATEFORMAT}")
|
||||||
if [ -z ${TYPE} ]; then
|
if [ -z ${TYPE} ]; then
|
||||||
TYPE=" - "
|
local TYPE=" - "
|
||||||
fi
|
fi
|
||||||
echo -e "[${DATE}][${TYPE}] ${MESSAGE}" >> ${LOGFILE}
|
echo -e "[${DATE}][${TYPE}] ${MESSAGE}" >> ${LOGFILE}
|
||||||
fi
|
fi
|
||||||
|
@ -130,10 +130,10 @@ function printWarn() {
|
||||||
# Parameters: %command%
|
# Parameters: %command%
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
function run() {
|
function run() {
|
||||||
COMMAND="${1}"
|
local COMMAND="${1}"
|
||||||
logMessage "Executing: \"${COMMAND}\"" "DEBUG"
|
logMessage "Executing: \"${COMMAND}\"" "DEBUG"
|
||||||
OUTPUT=$(${COMMAND} 2>&1)
|
local OUTPUT=$(${COMMAND} 2>&1)
|
||||||
RESULT=${?}
|
local RESULT=${?}
|
||||||
logOutput "${OUTPUT}"
|
logOutput "${OUTPUT}"
|
||||||
return ${RESULT}
|
return ${RESULT}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue