From: xf0r3m <jakubstasinski@protonmail.com>
Date: Wed, 24 Apr 2024 18:20:58 +0000 (+0200)
Subject: immudex-upgrade - aktualizacja GRUB-a - BT #169 - zmiana logiki gałęzi --upgrade... 
X-Git-Url: https://gitweb.morketsmerke.org/?a=commitdiff_plain;h=37e1c0d164f98d37a33d63315c7db0cc6fcdb894;p=immudex.git

immudex-upgrade - aktualizacja GRUB-a - BT #169 - zmiana logiki gałęzi --upgrade dodanie obsługi zmiany pliku GRUB-a także w drugim przypadku aktualizacji.
---

diff --git a/tools/sbin/immudex-upgrade b/tools/sbin/immudex-upgrade
index 6a147bb..fea7981 100755
--- a/tools/sbin/immudex-upgrade
+++ b/tools/sbin/immudex-upgrade
@@ -57,24 +57,44 @@ if [ "$1" ]; then
       done
       echo "Copying immudex files to the disk...";
       cp -vv /mnt/live/* ${mountPoint}/live;
+      if [ $? -eq 0 ]; then
+        echo -e "Copying immudex files to the disk...[ ${GREEN}OK${ENDCOLOR} ]";
+      else
+        echo -e "Copying immudex files to the disk...[ ${RED}FAIL${ENDCOLOR} ]";
+      fi
     else
-      echo "Mounting immudex partition...";
+      echo -n "Mounting immudex partition...";
       mount $part /mnt >> /dev/null 2>&1;
       if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
       echo "Copying immudex files to the disk...";
       cp -vv /run/live/medium/live/* /mnt/live;
-      if $(sudo efibootmgr > /dev/null 2>&1); then
-	echo "Copying grub config to the disk...";
-	cp -vv /run/live/medium/boot/grub/grub.cfg /mnt/boot/grub/grub.cfg;
-	if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-	sed -i '/set\ timeout=/ s/30/5/' /mnt/boot/grub/grub.cfg;
-	sed -i 's/bootfrom=removable //g' /mnt/boot/grub/grub.cfg;
+      if [ $? -eq 0 ]; then
+        echo -e "Copying immudex files to the disk...[ ${GREEN}OK${ENDCOLOR} ]";
+      else
+        echo -e "Copying immudex files to the disk...[ ${RED}FAIL${ENDCOLOR} ]";
       fi
     fi
-    if [ $? -eq 0 ]; then
-      echo -e "Copying immudex files to the disk...[ ${GREEN}OK${ENDCOLOR} ]";
-    else
-      echo -e "Copying immudex files to the disk...[ ${RED}FAIL${ENDCOLOR} ]";
+    if $(sudo efibootmgr > /dev/null 2>&1); then
+	    echo "Copying grub config to the disk...";
+      if [ "$mountPoint" ]; then
+        cp -vv /mnt/boot/grub/grub.cfg ${mountPoint}/boot/grub/grub.cfg;
+        if [ $? -eq 0 ]; then 
+          echo -e "Copying grub config to the disk...[ ${GREEN}OK${ENDCOLOR} ]";
+          sed -i '/set\ timeout=/ s/30/5/' ${mountPoint}/boot/grub/grub.cfg;
+	        sed -i 's/bootfrom=removable //g' ${mountPoint}/boot/grub/grub.cfg;
+        else
+          echo -e "Copying grub config to the disk...[ ${RED}FAIL${ENDCOLOR} ]";
+        fi
+      else
+	      cp -vv /run/live/medium/boot/grub/grub.cfg /mnt/boot/grub/grub.cfg;
+	      if [ $? -eq 0 ]; then 
+          echo -e "Copying grub config to the disk...[ ${GREEN}OK${ENDCOLOR} ]";
+	        sed -i '/set\ timeout=/ s/30/5/' /mnt/boot/grub/grub.cfg;
+	        sed -i 's/bootfrom=removable //g' /mnt/boot/grub/grub.cfg;
+        else
+          echo -e "Copying grub config to the disk...[ ${RED}FAIL${ENDCOLOR} ]";
+        fi
+      fi
     fi
   elif [ "$1" ] && [ "$1" = "--myversion" ]; then
     if [ -d /tmp/immudex ]; then