Merge pull request #1279 from jkonecny12/fix-RESULT-validation

Fix RESULT validation
rhinstaller · Aug 13, 2024 · 879933b · 879933b
2 parents 9ecebf2 + a5531a1
commit 879933b
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 39 deletions.
diff --git a/encrypt-device.sh b/encrypt-device.sh
@@ -34,7 +34,7 @@ validate() {
     if [[ $? != 0 ]]; then
         status=1
         echo '*** /home/RESULT does not exist in VM image.'
-    elif [[ "${result}" != SUCCESS* ]]; then
+    elif [[ "${result%% *}" != SUCCESS ]]; then
         status=1
         echo "${result}"
     fi

diff --git a/encrypt-swap.sh b/encrypt-swap.sh
@@ -44,7 +44,7 @@ validate() {
     if [[ $? != 0 ]]; then
         status=1
         echo '*** /root/RESULT does not exist in VM image.'
-    elif [[ "${result}" != SUCCESS* ]]; then
+    elif [[ "${result%% *}" != SUCCESS ]]; then
         status=1
         echo "${result}"
     fi

diff --git a/escrow-cert.sh b/escrow-cert.sh
@@ -35,7 +35,7 @@ validate() {
     if [[ $? != 0 ]]; then
         status=1
         echo '*** /root/RESULT does not exist in VM image.'
-    elif [[ "${result}" != SUCCESS* ]]; then
+    elif [[ "${result%% *}" != SUCCESS ]]; then
         status=1
         echo "${result}"
     fi

diff --git a/functions.sh b/functions.sh
@@ -219,7 +219,7 @@ check_result_file() {
     if [[ $? != 0 ]]; then
         status=1
         echo '*** /root/RESULT does not exist in VM image.'
-    elif [[ "${result}" != SUCCESS* ]]; then
+    elif [[ "${result%% *}" != SUCCESS ]]; then
         status=1
         echo "${result}"
     fi

diff --git a/nosave-1.sh b/nosave-1.sh
@@ -50,7 +50,7 @@ validate() {
     if [[ $? != 0 ]]; then
         status=1
         echo '*** /root/RESULT does not exist in VM image.'
-    elif [[ "${result}" != SUCCESS* ]]; then
+    elif [[ "${result%% *}" != SUCCESS ]]; then
         status=1
         echo "${result}"
     else

diff --git a/nosave-2.sh b/nosave-2.sh
@@ -50,7 +50,7 @@ validate() {
     if [[ $? != 0 ]]; then
         status=1
         echo '*** /root/RESULT does not exist in VM image.'
-    elif [[ "${result}" != SUCCESS* ]]; then
+    elif [[ "${result%% *}" != SUCCESS ]]; then
         status=1
         echo "${result}"
     else

diff --git a/nosave-3.sh b/nosave-3.sh
@@ -50,7 +50,7 @@ validate() {
     if [[ $? != 0 ]]; then
         status=1
         echo '*** /root/RESULT does not exist in VM image.'
-    elif [[ "${result}" != SUCCESS* ]]; then
+    elif [[ "${result%% *}" != SUCCESS ]]; then
         status=1
         echo "${result}"
     else

diff --git a/proxy-auth.sh b/proxy-auth.sh
@@ -93,16 +93,8 @@ validate() {
         fi
     fi
 
-    result=$(cat ${tmpdir}/RESULT)
-    if [[ $? != 0 ]]; then
-        echo '*** /root/RESULT does not exist in VM image.'
-        return 1
-    elif [[ "${result}" != SUCCESS* ]]; then
-        echo "${result}"
-        return 1
-    else
-        return 0
-    fi
+    check_result_file "${tmpdir}"
+    return $?
 }
 
 cleanup() {

diff --git a/proxy-cmdline.sh b/proxy-cmdline.sh
@@ -50,14 +50,6 @@ validate() {
 
     check_proxy_settings $tmpdir
 
-    result=$(cat ${tmpdir}/RESULT)
-    if [[ $? != 0 ]]; then
-        echo '*** /root/RESULT does not exist in VM image.'
-        return 1
-    elif [[ "${result}" != SUCCESS* ]]; then
-        echo "${result}"
-        return 1
-    else
-        return 0
-    fi
+    check_result_file "${tmpdir}"
+    return $?
 }
diff --git a/proxy-kickstart.sh b/proxy-kickstart.sh
@@ -87,16 +87,8 @@ validate() {
         fi
     fi
 
-    result=$(cat ${tmpdir}/RESULT)
-    if [[ $? != 0 ]]; then
-        echo '*** /root/RESULT does not exist in VM image.'
-        return 1
-    elif [[ "${result}" != SUCCESS* ]]; then
-        echo "${result}"
-        return 1
-    else
-        return 0
-    fi
+    check_result_file "${tmpdir}"
+    return $?
 }
 
 cleanup() {

diff --git a/raid-1.sh b/raid-1.sh
@@ -42,7 +42,7 @@ validate() {
     if [[ $? != 0 ]]; then
         status=1
         echo '*** /root/RESULT does not exist in VM image.'
-    elif [[ "${result}" != SUCCESS* ]]; then
+    elif [[ "${result%% *}" != SUCCESS ]]; then
         status=1
         echo "${result}"
     fi

diff --git a/raid-ddf.sh b/raid-ddf.sh
@@ -50,7 +50,7 @@ validate() {
     if [[ $? != 0 ]]; then
         status=1
         echo '*** /root/RESULT does not exist in VM image.'
-    elif [[ "${result}" != SUCCESS* ]]; then
+    elif [[ "${result%% *}" != SUCCESS ]]; then
         status=1
         echo "${result}"
     fi