Fixed merge paths and removed unused code
This commit is contained in:
parent
0d6f7e0ca0
commit
bc6ebdb80e
|
@ -121,7 +121,31 @@ else
|
|||
RUN_DIR=.
|
||||
fi
|
||||
|
||||
# Get a random number on Windows BusyBox alike, also works on most Unixes
|
||||
# Get a random number on Windows BusyBox alike, also works on most Unixes that have dd, if dd is not found, then return $RANDOM
|
||||
function PoorMansRandomGenerator {
|
||||
local digits="${1}" # The number of digits to generate
|
||||
local number
|
||||
local isFirst=true
|
||||
|
||||
if type dd >/dev/null 2>&1; then
|
||||
|
||||
# Some read bytes can't be used, se we read twice the number of required bytes
|
||||
dd if=/dev/urandom bs=$digits count=2 2> /dev/null | while read -r -n1 char; do
|
||||
if [ $isFirst == false ] || [ $(printf "%d" "'$char") != "0" ]; then
|
||||
number=$number$(printf "%d" "'$char")
|
||||
isFirst=false
|
||||
fi
|
||||
if [ ${#number} -ge $digits ]; then
|
||||
echo ${number:0:$digits}
|
||||
break;
|
||||
fi
|
||||
done
|
||||
elif [ "$RANDOM" -ne 0 ]; then
|
||||
echo $RANDOM
|
||||
else
|
||||
Logger "Cannot generate random number." "ERROR"
|
||||
fi
|
||||
}
|
||||
function PoorMansRandomGenerator {
|
||||
local digits="${1}" # The number of digits to generate
|
||||
local number
|
||||
|
|
13
dev/merge.sh
13
dev/merge.sh
|
@ -32,12 +32,7 @@ function __PREPROCESSOR_Merge {
|
|||
__PREPROCESSOR_MergeSubset "$subset" "${subset//SUBSET/SUBSET END}" "ofunctions.sh" "debug_$nPROGRAM.sh"
|
||||
done
|
||||
|
||||
__PREPROCESSOR_CleanDebug "debug_$nPROGRAM.sh" "$nPROGRAM.sh"
|
||||
rm -f tmp_$nPROGRAM.sh
|
||||
if [ $? != 0 ]; then
|
||||
Logger "Cannot remove tmp_$nPROGRAM.sh" "SIMPLE"
|
||||
exit 1
|
||||
fi
|
||||
__PREPROCESSOR_CleanDebug "debug_$nPROGRAM.sh" "../$nPROGRAM.sh"
|
||||
}
|
||||
|
||||
function __PREPROCESSOR_Constants {
|
||||
|
@ -165,12 +160,6 @@ function __PREPROCESSOR_CopyCommons {
|
|||
|
||||
__PREPROCESSOR_CleanDebug "../install.sh"
|
||||
|
||||
#sed "s/\[version\]/$VERSION/g" ../tmp_install.sh > ../install.sh
|
||||
#if [ $? != 0 ]; then
|
||||
# Logger "Cannot change install version." "SIMPLE"
|
||||
# exit 1
|
||||
#fi
|
||||
|
||||
if [ -f "common_batch.sh" ]; then
|
||||
sed "s/\[prgname\]/$nPROGRAM/g" common_batch.sh > ../$nPROGRAM-batch.sh
|
||||
if [ $? != 0 ]; then
|
||||
|
|
Loading…
Reference in New Issue