From fd4bd0081a6858824fb0c75103fd9e2bd8bbad78 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Tue, 7 Jan 2025 23:15:05 +0100
Subject: [PATCH] Fixed typo's Fedora implementation of ReleaseUpgrade

---
 ReleaseUpgradeALL.sh |  2 +-
 ReleaseUpgradeOne.sh | 10 ++++++----
 functions.sh         | 12 ++++++------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ReleaseUpgradeALL.sh b/ReleaseUpgradeALL.sh
index 759fbd1..b637866 100755
--- a/ReleaseUpgradeALL.sh
+++ b/ReleaseUpgradeALL.sh
@@ -78,7 +78,7 @@ echo "Enter the Alpine version to upgrade to"
 fi
 if $DoFedoraReleaseUpdate; then
 echo "Enter the Fedora version to upgrade to"
-  read NewFedoraVersionNewFedoraVersion
+  read NewFedoraVersion
   while true; do
       read -p "Upgrade to Fedora $NewFedoraVersion, is this correct? -> yes/no?" yn
       case $yn in
diff --git a/ReleaseUpgradeOne.sh b/ReleaseUpgradeOne.sh
index 250d5f5..4a840a1 100644
--- a/ReleaseUpgradeOne.sh
+++ b/ReleaseUpgradeOne.sh
@@ -50,6 +50,7 @@ if [[ "${DIST}" == *"debian"* ]]; then
     #Ask the wanted Debian version
     DoDebianReleaseUpdate=true
     DoAlpineReleaseUpdate=false
+    DoFedoraReleaseUpdate=false
 
     echo "Enter the Debian version to upgrade to"
     read NewDebianVersion
@@ -68,6 +69,7 @@ elif [[ "${DIST}" == *"alpine"* ]]; then
     #Ask the wanted Alpine version
     DoAlpineReleaseUpdate=true
     DoDebianReleaseUpdate=false
+    DoFedoraReleaseUpdate=false
 
     echo "Enter the Alpine version to upgrade to"
     read NewAlpineVersion
@@ -84,12 +86,12 @@ elif [[ "${DIST}" == *"alpine"* ]]; then
     done
 elif [[ "${DIST}" == *"fedora"* ]]; then
     #Ask the wanted Fedora version
-    DoDebianReleaseUpdate=true
-    DoAlpineReleaseUpdate=true
-    DoFedoraReleaseUpdate=false
+    DoDebianReleaseUpdate=false
+    DoAlpineReleaseUpdate=false
+    DoFedoraReleaseUpdate=true
 
     echo "Enter the Fedora version to upgrade to"
-    read NewFedoraVersionNewFedoraVersion
+    read NewFedoraVersion
     while true; do
         read -p "Upgrade to Fedora $NewFedoraVersion, is this correct? -> yes/no?" yn
         case $yn in
diff --git a/functions.sh b/functions.sh
index cec6b32..224cb63 100644
--- a/functions.sh
+++ b/functions.sh
@@ -202,18 +202,18 @@ UpgradeRelease () {
         else
           echo "Notice: Skiped, already up-to-date"
         fi
-    elif [[ "${DIST}" == *"fedora"* ]]; then
-        echo "Notice: Release upgrade disabled for Fedora"
-    elif [[ "${DIST}" == *"alpine"* ]] && $DoFedoraReleaseUpdate ; then
+    elif [[ "${DIST}" == *"alpine"* ]]; then
+        echo "Notice: Release upgrade disabled for Alpine"
+    elif [[ "${DIST}" == *"fedora"* ]] && $DoFedoraReleaseUpdate ; then
         if [ $RELVERSION != $NewFedoraVersion ]; then
          #Create snapshot before upgrading
          $SNAPSHOTCMD "Before upgrade form Fedora $RELVERSION to Fedora $NewFedoraVersion" 
          #Fully update current version
          $INSTCALL -- dnf install dnf-plugin-system-upgrade remove-retired-packages symlinks clean-rpm-gpg-pubkey -y
          $INSTCALL -- dnf upgrade --refresh -y
-         $INSTCALL -- system-upgrade download --releasever=$RELVERSION -y
-         $INSTCALL -- system-upgrade reboot
-         echo waiting 5 minutes for Fedora to install its update while rebooting
+         $INSTCALL -- dnf system-upgrade download --releasever=$NewFedoraVersion -y
+         $INSTCALL -- dnf system-upgrade reboot
+         echo Waiting 5 minutes for Fedora to install its update while rebooting
          sleep 300
          $INSTCALL -- dnf remove --duplicates -y
          $INSTCALL -- dnf autoremove -y