g_num_valid_number function

dabo/analyze.sh

@@ -22,6 +22,7 @@ function analyze {
   . dabo/functions/g_num_is_approx.sh
   . dabo/functions/g_num_is_between.sh
   . dabo/functions/g_num_is_higher.sh
+  . dabo/functions/g_num_valid_number.sh
   . dabo/dabo-bot.conf
   . dabo-bot.conf
   . analyze.conf

dabo/functions/g_num_is_approx.sh

@@ -7,14 +7,8 @@ function g_num_is_approx {
   local f_percentage_down=$4
 
   # Check for valid decimal number
-  for f_numtest in "${f_num}" "${f_base}" "${f_percentage_up}" "${f_percentage_down}"
+  
-  do
+  g_num_valid_number "${f_num}" "${f_base}" "${f_percentage_up}" "${f_percentage_down}" || return 1
-    if ! [[ ${f_numtest} =~ ^(-)?[0-9]+(\.[0-9]+)?$ ]]
-    then
-      g_echo "\"${f_numtest}\"Not a valid number"
-      return 1
-    fi
-  done
  
   local f_from=$(echo "${f_base} - (${f_base} / 100 * ${f_percentage_down})" | bc -l)
   local f_to=$(echo "${f_base} + (${f_base} / 100 * ${f_percentage_up})" | bc -l)

dabo/functions/g_num_is_between.sh

@@ -25,15 +25,8 @@ function g_num_is_between {
     fi
   fi
 
-  # Check for valid decimal number
+  # Check for valid number
-  for f_numtest in "$f_num" "$f_between1" "$f_between2"
+  g_num_valid_number "$f_num" "$f_between1" "$f_between2" || return 1
-  do
-    if ! [[ ${f_numtest} =~ ^(-)?[0-9]+(\.[0-9]+)?$ ]]
-    then
-      g_echo "\"${f_numtest}\"Not a valid number"
-      return 1
-    fi
-  done
 
   # Check which is the low (from) and the high (to) number
   if [ $(echo "${f_between1} < ${f_between2}" | bc -l) -ne 0 ]

dabo/functions/g_num_is_higher.sh

@@ -15,15 +15,8 @@ function g_num_is_higher {
     fi
   fi
 
-  # Check for valid decimal number
+  # Check for valid number
-  for f_numtest in "$f_num" "$f_checkhigher"
+  g_num_valid_number "$f_num" "$f_checkhigher" || return 1
-  do
-    if ! [[ ${f_numtest} =~ ^(-)?[0-9]+(\.[0-9]+)?$ ]]
-    then
-      g_echo "\"${f_numtest}\"Not a valid number"
-      return 1
-    fi
-  done
  
   # Check which is the low (from) and the high (to) number
   # Check if given number is in or out range

dabo/functions/g_num_valid_number.sh

@@ -0,0 +1,12 @@
+function g_num_valid_number {
+  local f_num
+  for f_num in $@
+  do
+    if ! [[ ${f_num} =~ ^(-\.)?[0-9]+(\.[0-9]+)?$ ]]
+    then
+      g_echo "\"${f_num}\": Not a valid number"
+      return 1
+    fi
+  done
+}
+