fix: issue where certain string would crash numeric checks

artefactory · May 7, 2021 · 7c2dcea · 7c2dcea
1 parent 59b0458
commit 7c2dcea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/bin/set_network.sh b/bin/set_network.sh
@@ -30,7 +30,7 @@ else
   MAX_CHOICE=$((counter - 1))
   read -p 'Please enter your numeric choice: ' NUMERIC_CHOICE
 
-  while (( NUMERIC_CHOICE < 1 )) || (( NUMERIC_CHOICE > MAX_CHOICE ))
+  while echo "$NUMERIC_CHOICE" | grep -vqE "^\-?[0-9]+$" || (( NUMERIC_CHOICE < 1 )) || (( NUMERIC_CHOICE > MAX_CHOICE ))
   do
     read -p "Please enter a value between 1 and $MAX_CHOICE: " NUMERIC_CHOICE
   done

diff --git a/bin/set_project.sh b/bin/set_project.sh
@@ -18,7 +18,7 @@ done
 MAX_CHOICE=$((counter - 1))
 read -p 'Please enter your numeric choice: ' NUMERIC_CHOICE
 
-while (( NUMERIC_CHOICE < 1 )) || (( NUMERIC_CHOICE > MAX_CHOICE ))
+while echo "$NUMERIC_CHOICE" | grep -vqE "^\-?[0-9]+$" || (( NUMERIC_CHOICE < 1 )) || (( NUMERIC_CHOICE > MAX_CHOICE ))
 do
   read -p "Please enter a value between 1 and $MAX_CHOICE: " NUMERIC_CHOICE
 done

diff --git a/bin/set_users.sh b/bin/set_users.sh
@@ -12,11 +12,11 @@ add_access () {
   MAX_CHOICE=$((counter - 1))
   read -p 'Please enter your numeric choice: ' NUMERIC_CHOICE
 
-  while (( $NUMERIC_CHOICE < 1 )) || (( $NUMERIC_CHOICE > $MAX_CHOICE ))
+  while echo "$NUMERIC_CHOICE" | grep -vqE "^\-?[0-9]+$" || (( NUMERIC_CHOICE < 1 )) || (( NUMERIC_CHOICE > MAX_CHOICE ))
   do
     read -p "Please enter a value between 1 and $MAX_CHOICE: " NUMERIC_CHOICE
   done
-  NUMERIC_CHOICE="$(( $NUMERIC_CHOICE - 1 ))"
+  NUMERIC_CHOICE="$(( NUMERIC_CHOICE - 1 ))"
 }
 
 echo
@@ -50,6 +50,7 @@ do
       fi
     fi
   fi
+
 done
 
 IFS=',';WEB_APP_USERS=\'[${WEB_APP_USERS[*]}]\';IFS=$' \t\n'