Merge pull request #4 from 1337kid/dev

v1.8.2
1337kid · Oct 24, 2023 · a94a81e · a94a81e
2 parents e1af5e3 + f9775ae
commit a94a81e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/noicegrub/__init__.py b/noicegrub/__init__.py
@@ -28,4 +28,4 @@ def preset_table():
 8  `b8 8    8  8 8    . 8.     8    8  8    8 8    8  8    8 
 8   `8 `YooP'  8 `YooP' `Yooo' `YooP8  8    8 `YooP'  8oooP' 
 ..:::..:.....::..:.....::.....::....8 :..:::..:.....::......:
-:::::::: @1337kid ::::::::::::::::::8 ::::::: v1.8.1 :::::::::\n'''
+:::::::: @1337kid ::::::::::::::::::8 ::::::: v1.8.2 :::::::::\n'''
diff --git a/scripts/install.sh b/scripts/install.sh
@@ -1,12 +1,29 @@
 #!/bin/bash
+
+THEMES_PATH=''
+
+#==========================
+get_path() {
+    if [[ -d "/boot/grub2" ]]; then
+    THEMES_PATH='/boot/grub2/themes/noicegrub'
+    elif [[ -d "/boot/grub" ]]; then
+    THEMES_PATH='/boot/grub/themes/noicegrub'
+    elif [[ -d "/boot/efi/EFI/fedora" ]]; then
+    THEMES_PATH='/boot/efi/EFI/fedora/themes/noicegrub'
+    fi
+}
+
+get_path
+#=========================
+
 printf "\033[94m\033[1m"
 cat <<EOF                          
          _                     _             _ _   
  ___ ___|_|___ ___ ___ ___ _ _| |_ _ _ ___ _| | |_ 
 |   | . | |  _| -_| . |  _| | | . | | | . | . |  _|
 |_|_|___|_|___|___|_  |_| |___|___|___|  _|___|_|  
                   |___|               |_|          
-          NoiceGRUB Theme Installer v1.2
+          NoiceGRUB Theme Installer v1.3
 
 EOF
 
@@ -16,11 +33,11 @@ then
     exit
 fi
 
-printf "\033[92m[+] \033[94mCreating /boot/grub/themes/noicegrub\n"
-mkdir -p /boot/grub/themes/noicegrub
+printf "\033[92m[+] \033[94mCreating $THEMES_PATH\n"
+mkdir -p $THEMES_PATH
 printf "\033[92m[+] \033[94mCopying files\n"
-cp ./export/* /boot/grub/themes/noicegrub
+cp ./export/* $THEMES_PATH
 sed -i 's/.*GRUB_THEME=.*//' /etc/default/grub
-echo "GRUB_THEME=/boot/grub/themes/noicegrub/theme.txt" >> /etc/default/grub
+echo "GRUB_THEME=$THEMES_PATH/theme.txt" >> /etc/default/grub
 printf "\033[92m[+] \033[94mRunning update-grub\n\033[92m"
 update-grub