Merge pull request #109 from kiloutyg/108-add-test-to-check-if-than-a…

…nswers-has-been-given-during-installupdate-script-execution added check to ensure no empty string has been passed in the variables
kiloutyg · Sep 5, 2024 · 2deac28 · 2deac28
2 parents 3e73837 + 8d75a10
commit 2deac28
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 8 deletions.
diff --git a/env_create.sh b/env_create.sh
@@ -21,16 +21,24 @@ while true; do
     else
         break
     fi
+    if [ -z "${PLANT_TRIGRAM}" ]
+      then
+        echo "The plant trigram should not be empty. Please try again."
+    fi
 done
 
 # Ask the name of the site or plant
 while true; do
 read -p "Please enter the name of the facility or plant (example: Langres or Andance): " FACILITY_NAME
 if is_FACILITY_name_valid "$FACILITY_NAME"; then
     echo "The site name should contain the first letter uppercase. Please try again."
-else
-        break
-    fi
+  else
+    break
+  fi
+  if [ -z "${FACILITY_NAME}" ]
+    then
+      echo "The site name should not be empty. Please try again."
+  fi
 done
 
 

diff --git a/env_update.sh b/env_update.sh
@@ -11,12 +11,16 @@ is_FACILITY_name_valid() {
 
 # Ask the name of the site or plant
 while true; do
-read -p "Please enter the name of the facility or plant (example: Langres or Andance): " FACILITY_NAME
-if is_FACILITY_name_valid "$FACILITY_NAME"; then
+  read -p "Please enter the name of the facility or plant (example: Langres or Andance): " FACILITY_NAME
+  if is_FACILITY_name_valid "$FACILITY_NAME"; then
     echo "The site name should contain the first letter uppercase. Please try again."
-else
-        break
-    fi
+  else
+    break
+  fi
+  if [ -z "${FACILITY_NAME}" ]
+    then
+      echo "The site name should not be empty. Please try again."
+  fi
 done
 
 # Function to check for uppercase characters
@@ -32,6 +36,10 @@ while true; do
     else
         break
     fi
+    if [ -z "${PLANT_TRIGRAM}" ]
+      then
+        echo "The plant trigram should not be empty. Please try again."
+    fi
 done
 
 # Load the environment variables from the .env file

diff --git a/install-eFNC2.sh b/install-eFNC2.sh
@@ -56,6 +56,10 @@ sg docker -c "
         else
             break
         fi
+        if [ -z "${GITHUB_USER}" ]
+        then
+            echo "The github user name should not be empty. Please try again."
+        fi
     done
 
 # Ask the user for the git repository address either in ssh or http
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,10 @@ sg docker -c " @@
             else
                 break
             fi
+            if [ -z "${GITHUB_USER}" ]
+            then
+                echo "The github user name should not be empty. Please try again."
+            fi
         done
     # Ask the user for the git repository address either in ssh or http
@@ Expand Down @@