From ea4809e86faa6c2178861e94ecd0ed467afa4767 Mon Sep 17 00:00:00 2001
From: WeeXnes <somtrigi@gmail.com>
Date: Tue, 14 Jan 2025 01:23:53 +0100
Subject: [PATCH] updated features

---
 Scripts/.refind/update-secureboot      |  3 +++
 Scripts/.refind/update-secureboot.hook | 10 ++++++++++
 Scripts/aio_installation.sh            |  4 ++++
 Scripts/custom_pst.sh                  | 22 +++++++++++++++-------
 4 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 Scripts/.refind/update-secureboot
 create mode 100644 Scripts/.refind/update-secureboot.hook
 create mode 100644 Scripts/aio_installation.sh

diff --git a/Scripts/.refind/update-secureboot b/Scripts/.refind/update-secureboot
new file mode 100644
index 0000000..8d9bf04
--- /dev/null
+++ b/Scripts/.refind/update-secureboot
@@ -0,0 +1,3 @@
+#!/bin/bash
+echo -e "\033[0;32m[SECUREBOOT]\033[0m signing [/boot/vmlinuz-linux] due to linux kernel update"
+sudo sbsign --key /etc/refind.d/keys/refind_local.key --cert /etc/refind.d/keys/refind_local.crt --output /boot/vmlinuz-linux /boot/vmlinuz-linux
\ No newline at end of file
diff --git a/Scripts/.refind/update-secureboot.hook b/Scripts/.refind/update-secureboot.hook
new file mode 100644
index 0000000..ed7de47
--- /dev/null
+++ b/Scripts/.refind/update-secureboot.hook
@@ -0,0 +1,10 @@
+[Trigger]
+Operation = Install
+Operation = Upgrade
+Type = Package
+Target = linux
+
+[Action]
+Description = Running update-secureboot script after kernel upgrade
+When = PostTransaction
+Exec = /usr/bin/update-secureboot
\ No newline at end of file
diff --git a/Scripts/aio_installation.sh b/Scripts/aio_installation.sh
new file mode 100644
index 0000000..8afc2b7
--- /dev/null
+++ b/Scripts/aio_installation.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+./install_without_services.sh custom_apps.lst
+sleep 5
+./install.sh custom_apps.lst
\ No newline at end of file
diff --git a/Scripts/custom_pst.sh b/Scripts/custom_pst.sh
index 2663464..2f144dd 100755
--- a/Scripts/custom_pst.sh
+++ b/Scripts/custom_pst.sh
@@ -3,26 +3,34 @@
 scrDir=$(dirname "$(realpath "$0")")
 source "${scrDir}/global_fn.sh"
 
-REFINDCONF="/boot/efi/EFI/refind/refind.conf"
+REFINDCONF="/boot/EFI/refind/refind.conf"
 
 install_secureboot(){
   sudo pacman -S sbsigntools efitools refind
   echo "[sbsigntools, efitools, refind] installed, press any key to continue ..."
   sudo refind-install --shim /usr/share/shim-signed/shimx64.efi --localkeys
   echo "[refind-install] executed, press any key to continue ..."
-  echo signing [/boot/efi/EFI/endeavouros/grubx64.efi]
-  sudo sbsign --key /etc/refind.d/keys/refind_local.key --cert /etc/refind.d/keys/refind_local.crt --output /boot/efi/EFI/endeavouros/grubx64.efi /boot/efi/EFI/endeavouros/grubx64.efi
-  echo signing [/boot/efi/EFI/boot/bootx64.efi]
-  sudo sbsign --key /etc/refind.d/keys/refind_local.key --cert /etc/refind.d/keys/refind_local.crt --output /boot/efi/EFI/boot/bootx64.efi /boot/efi/EFI/boot/bootx64.efi
+
+  echo signing [/boot/EFI/BOOT/BOOTX64.EFI]
+  sudo sbsign --key /etc/refind.d/keys/refind_local.key --cert /etc/refind.d/keys/refind_local.crt --output /boot/EFI/BOOT/BOOTX64.EFI /boot/EFI/BOOT/BOOTX64.EFI
   echo signing [/boot/vmlinuz-linux]
   sudo sbsign --key /etc/refind.d/keys/refind_local.key --cert /etc/refind.d/keys/refind_local.crt --output /boot/vmlinuz-linux /boot/vmlinuz-linux
+
+  echo -e "\033[0;32m[SECUREBOOT]\033[0m installing update-secureboot script to /usr/bin/update-secureboot"
+  sudo cp .refind/update-secureboot /usr/bin/update-secureboot
+
+
+  echo -e "\033[0;32m[SECUREBOOT]\033[0m installing pacman hook for automatic secureboot updates"
+  sudo mkdir -p /etc/pacman.d/hooks/
+  sudo cp .refind/update-secureboot.hook /etc/pacman.d/hooks/update-secureboot.hook
+
 }
 
 install_theme(){
-    sudo mkdir -p /boot/efi/EFI/refind/themes
+    sudo mkdir -p /boot/EFI/refind/themes
     git clone https://github.com/catppuccin/refind.git catppuccin
     cp catppuccin/assets/mocha/icons/os_arch.png catppuccin/assets/mocha/icons/os_endeavouros.png
-    sudo cp -rf catppuccin /boot/efi/EFI/refind/themes/
+    sudo cp -rf catppuccin /boot/EFI/refind/themes/
     sudo rm $REFINDCONF
     sudo cp .refind/refind.conf $REFINDCONF
     rm -rf catppuccin