@ -3,11 +3,12 @@
#### OFUNCTIONS MINI SUBSET ####
_OFUNCTIONS_VERSION = 2.1-RC1+dev
_OFUNCTIONS_BUILD = 201 6122 701
_OFUNCTIONS_BUILD = 201 70104 01
#### _OFUNCTIONS_BOOTSTRAP SUBSET ####
_OFUNCTIONS_BOOTSTRAP = true
#### _OFUNCTIONS_BOOTSTRAP SUBSET END ####
## BEGIN Generic bash functions written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
## BEGIN Generic bash functions written in 2013-2017 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
## To use in a program, define the following variables:
## PROGRAM=program-name
@ -586,7 +587,7 @@ function TrapError {
local code = " ${ 2 :- 1 } "
if [ $_LOGGER_SILENT = = false ] ; then
echo -e " \e[45m/!\ ERROR in ${ job } : Near line ${ line } , exit code ${ code } \e[0m "
( >& 2 echo -e " \e[45m/!\ ERROR in ${ job } : Near line ${ line } , exit code ${ code } \e[0m " )
fi
}
#### TrapError SUBSET END ####
@ -680,7 +681,7 @@ function WaitForTaskCompletion {
Spinner
fi
if [ $counting = = true ] ; then
exec_time = $(( $ SECONDS - $ seconds_begin))
exec_time = $(( SECONDS - seconds_begin))
else
exec_time = $SECONDS
fi
@ -836,7 +837,7 @@ function ParallelExec {
fi
if [ $counting = = true ] ; then
exec_time = $(( $ SECONDS - $ seconds_begin))
exec_time = $(( SECONDS - seconds_begin))
else
exec_time = $SECONDS
fi
@ -874,7 +875,7 @@ function ParallelExec {
fi
eval " HARD_MAX_EXEC_TIME_REACHED_ $callerName =true "
# Return the number of commands that haven't run / finished run
return $(( $ commandCount - $ counter + ${# pidsArray [@] } ))
return $(( commandCount - counter + ${# pidsArray [@] } ))
fi
while [ $counter -lt " $commandCount " ] && [ ${# pidsArray [@] } -lt $numberOfProcesses ] ; do
@ -897,7 +898,6 @@ function ParallelExec {
if [ $( IsInteger $pid ) -eq 1 ] ; then
# Handle uninterruptible sleep state or zombies by ommiting them from running process array (How to kill that is already dead ? :)
if kill -0 $pid > /dev/null 2>& 1; then
#pidState=$(ps -p$pid -o state= 2 > /dev/null)
pidState = " $( eval $PROCESS_STATE_CMD ) "
if [ " $pidState " != "D" ] && [ " $pidState " != "Z" ] ; then
newPidsArray += ( $pid )
@ -921,7 +921,7 @@ function ParallelExec {
pidsArray = ( " ${ newPidsArray [@] } " )
# Trivial wait time for bash to not eat up all CPU
sleep $ SLEEP_TIME
sleep $ sleepTime
done
return $errorCount
@ -937,11 +937,6 @@ function CleanUp {
fi
}
# obsolete, use StripQuotes
function SedStripQuotes {
echo $( echo $1 | sed "s/^\([\"']\)\(.*\)\1\$/\2/g" )
}
# Usage: var=$(StripSingleQuotes "$var")
function StripSingleQuotes {
local string = " ${ 1 } "
@ -1423,8 +1418,8 @@ function __CheckArguments {
if [ " $argument " = = "" ] ; then
fetchArguments = false
else
argList = " $argList [Argument $(( $ iterate - 2)) : $argument ] "
iterate = $(( $ iterate + 1))
argList = " $argList [Argument $(( iterate-2)) : $argument ] "
iterate = $(( iterate+1))
fi
done
@ -1440,7 +1435,7 @@ function __CheckArguments {
Logger " Entering function [ $callerName ]. " "PARANOIA_DEBUG"
if ! ( [ $countedArguments -ge $minArgs ] && [ $countedArguments -le $maxArgs ] ) ; then
Logger " Function $ function Name may have inconsistent number of arguments. Expected min: $minArgs , max: $maxArgs , count: $countedArguments , bash seen: $numberOfGivenArguments . see log file ." "ERROR"
Logger " Function $ caller Name may have inconsistent number of arguments. Expected min: $minArgs , max: $maxArgs , count: $countedArguments , bash seen: $numberOfGivenArguments ." "ERROR"
Logger " $callerName arguments: $argList " "ERROR"
else
if [ ! -z " $argList " ] ; then