Improve checks

panorama-ed · Jul 12, 2024 · c353dcc · c353dcc
1 parent 073069f
commit c353dcc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/config.sh b/config.sh
@@ -9,6 +9,18 @@ else
     . ./utils.sh
 fi
 
+if [[ -z "${INTEGRATION_PORTAL_URL}" ]]; then
+    red_echo "INTEGRATION_PORTAL_URL must be provided"
+    exit
+fi
+
+echo "$LINENO" >> /tmp/leapp-setup.log
+
+if [[ -z "${LEAPP_ROLES}" ]]; then
+    red_echo "LEAPP_ROLES must be provided"
+    exit
+fi
+
 if [[ "$kernel_name" == "Darwin" ]]; then
     # Leapp integration setup
     LEAPP=/Applications/Leapp.app

diff --git a/setup.sh b/setup.sh
@@ -40,14 +40,14 @@ fi
 
 echo "$LINENO" >> /tmp/leapp-setup.log
 
-if [[ "${CONFIGURE}" != "0" ]] && [[ -z "${INTEGRATION_PORTAL_URL}" ]]; then
+if [[ "${CONFIGURE_LEAPP}" != "0" ]] && [[ -z "${INTEGRATION_PORTAL_URL}" ]]; then
     red_echo "INTEGRATION_PORTAL_URL must be provided"
     exit
 fi
 
 echo "$LINENO" >> /tmp/leapp-setup.log
 
-if [[ "${CONFIGURE}" != "0" ]] && [[ -z "${LEAPP_ROLES}" ]]; then
+if [[ "${CONFIGURE_LEAPP}" != "0" ]] && [[ -z "${LEAPP_ROLES}" ]]; then
     red_echo "LEAPP_ROLES must be provided"
     exit
 fi
@@ -150,7 +150,7 @@ fi
 
 echo "$LINENO" >> /tmp/leapp-setup.log
 
-if [[ "${CONFIGURE}" == "0" ]]; then
+if [[ "${CONFIGURE_LEAPP}" == "0" ]]; then
     exit
 fi