From afc80c621ee88a579f9e5fd5753d3d30c55da9af Mon Sep 17 00:00:00 2001 From: AngeD Date: Tue, 14 Mar 2023 19:08:22 +0100 Subject: [PATCH] fix: root perms, grub autodetect esp --- base_install.sh | 2 +- config | 1 - dwm/install.sh | 2 +- gpu.sh | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/base_install.sh b/base_install.sh index a7c2740..19414ba 100755 --- a/base_install.sh +++ b/base_install.sh @@ -58,7 +58,7 @@ if [ -n "$grub_timeout" ]; then sed -i "/GRUB_TIMEOUT=/s/.*/GRUB_TIMEOUT=$grub_timeout/" /etc/default/grub fi -grub-install --target=x86_64-efi --efi-directory="$esp" --bootloader-id=GRUB +grub-install --target=x86_64-efi --bootloader-id=GRUB grub-mkconfig -o /boot/grub/grub.cfg echo -e "${BOLD}${GREEN}DONE. Ctrl+D, umount -R /mnt and reboot${NORMAL}" diff --git a/config b/config index fbe09e2..ec9ae21 100644 --- a/config +++ b/config @@ -13,7 +13,6 @@ locales=( ) lang="${locales[0]}" -esp="$(lsblk -f | grep vfat | grep -o '/boot.*')" grub_timeout=1 pkg=( diff --git a/dwm/install.sh b/dwm/install.sh index b6ae90c..deb3eb6 100755 --- a/dwm/install.sh +++ b/dwm/install.sh @@ -8,7 +8,7 @@ GREEN='\e[32m' PACMAN='pacman --noconfirm --needed -Syu' -if [ "$EUID" = 0 ]; then +if [ "$EUID" != 0 ]; then echo 'This script needs root privileges.' exit 1 fi diff --git a/gpu.sh b/gpu.sh index eefa31f..e089f08 100755 --- a/gpu.sh +++ b/gpu.sh @@ -7,7 +7,7 @@ GREEN='\e[32m' PACMAN='pacman --noconfirm --needed -Syu' -if [ "$EUID" = 0 ]; then +if [ "$EUID" != 0 ]; then echo 'This script needs root privileges.' exit 1 fi