script dir
This commit is contained in:
parent
60434269b8
commit
a48e7914ac
|
|
@ -1,8 +1,9 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# shellcheck disable=SC1091,SC2001
|
# shellcheck disable=SC1091,SC2001
|
||||||
# shellcheck source=./setup.conf
|
# shellcheck source=./setup.conf
|
||||||
|
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
|
||||||
|
|
||||||
CONFIG_FILE=$(pwd)/setup.conf
|
CONFIG_FILE="$SCRIPT_DIR"/setup.conf
|
||||||
if [[ -f "$CONFIG_FILE" ]]; then
|
if [[ -f "$CONFIG_FILE" ]]; then
|
||||||
source "$CONFIG_FILE"
|
source "$CONFIG_FILE"
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,9 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# shellcheck disable=SC1091
|
# shellcheck disable=SC1091
|
||||||
# shellcheck source=./setup.conf
|
# shellcheck source=./setup.conf
|
||||||
|
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
|
||||||
|
|
||||||
CONFIG_FILE=$(pwd)/setup.conf
|
CONFIG_FILE="$SCRIPT_DIR"/setup.conf
|
||||||
if [[ -f "$CONFIG_FILE" ]]; then
|
if [[ -f "$CONFIG_FILE" ]]; then
|
||||||
source "$CONFIG_FILE"
|
source "$CONFIG_FILE"
|
||||||
else
|
else
|
||||||
|
|
@ -159,7 +160,7 @@ else
|
||||||
echo "No graphics card found!"
|
echo "No graphics card found!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ENCRYP_UUID=$(blkid -s UUID -o value "$PART2")
|
ENCRYPT_UUID=$(blkid -s UUID -o value "$PART2")
|
||||||
PART_UUID=$(blkid -s PARTUUID -o value "$PART2")
|
PART_UUID=$(blkid -s PARTUUID -o value "$PART2")
|
||||||
|
|
||||||
case "$BOOTLOADER" in
|
case "$BOOTLOADER" in
|
||||||
|
|
@ -168,7 +169,7 @@ grub)
|
||||||
install_pkg grub os-prober
|
install_pkg grub os-prober
|
||||||
if [[ "$LUKS" -eq 1 ]]; then
|
if [[ "$LUKS" -eq 1 ]]; then
|
||||||
echo "Installing GRUB for LUKS"
|
echo "Installing GRUB for LUKS"
|
||||||
sed -i -e 's/GRUB_CMDLINE_LINUX="\(.\+\)"/GRUB_CMDLINE_LINUX="\1 cryptdevice=UUID='"${ENCRYP_UUID}"':luks"/g' -e 's/GRUB_CMDLINE_LINUX=""/GRUB_CMDLINE_LINUX="cryptdevice=UUID'"${ENCRYP_UUID}"':luks"/g' /etc/default/grub
|
sed -i -e 's/GRUB_CMDLINE_LINUX="\(.\+\)"/GRUB_CMDLINE_LINUX="\1 cryptdevice=UUID='"${ENCRYPT_UUID}"':luks"/g' -e 's/GRUB_CMDLINE_LINUX=""/GRUB_CMDLINE_LINUX="cryptdevice=UUID'"${ENCRYPT_UUID}"':luks"/g' /etc/default/grub
|
||||||
fi
|
fi
|
||||||
if [[ "$UEFI" -eq 1 ]]; then
|
if [[ "$UEFI" -eq 1 ]]; then
|
||||||
grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=GRUB --recheck
|
grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=GRUB --recheck
|
||||||
|
|
@ -182,7 +183,7 @@ systemd)
|
||||||
echo "Installing systemd-boot"
|
echo "Installing systemd-boot"
|
||||||
bootctl --path=/boot install
|
bootctl --path=/boot install
|
||||||
if [[ $LUKS -eq 1 ]]; then
|
if [[ $LUKS -eq 1 ]]; then
|
||||||
echo -e "title\tArchTitus\nlinux\t/vmlinuz-linux\ninitrd\t/initramfs-linux.img\noptions\tcryptdevice=UUID=$ENCRYP_UUID:luks root=\/dev\/$LVM_VG\/${LVM_NAMES[0]} rw" >/boot/loader/entries/arch.conf
|
echo -e "title\tArchTitus\nlinux\t/vmlinuz-linux\ninitrd\t/initramfs-linux.img\noptions\tcryptdevice=UUID=$ENCRYPT_UUID:luks root=\/dev\/$LVM_VG\/${LVM_NAMES[0]} rw" >/boot/loader/entries/arch.conf
|
||||||
elif [[ $LVM -eq 1 ]]; then
|
elif [[ $LVM -eq 1 ]]; then
|
||||||
echo -e "title\tArchTitus\nlinux\t/vmlinuz-linux\ninitrd\t/initramfs-linux.img\noptions\troot=\/dev\/$LVM_VG\/${LVM_NAMES[0]} rw" >/boot/loader/entries/arch.conf
|
echo -e "title\tArchTitus\nlinux\t/vmlinuz-linux\ninitrd\t/initramfs-linux.img\noptions\troot=\/dev\/$LVM_VG\/${LVM_NAMES[0]} rw" >/boot/loader/entries/arch.conf
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,9 @@
|
||||||
# However I will leave this up to you.
|
# However I will leave this up to you.
|
||||||
# shellcheck disable=SC1091
|
# shellcheck disable=SC1091
|
||||||
# shellcheck source=./setup.conf
|
# shellcheck source=./setup.conf
|
||||||
|
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
|
||||||
|
|
||||||
CONFIG_FILE=$(pwd)/setup.conf
|
CONFIG_FILE="$SCRIPT_DIR"/setup.conf
|
||||||
if [[ -f "$CONFIG_FILE" ]]; then
|
if [[ -f "$CONFIG_FILE" ]]; then
|
||||||
source "$CONFIG_FILE"
|
source "$CONFIG_FILE"
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,9 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# shellcheck disable=SC1091
|
# shellcheck disable=SC1091
|
||||||
# shellcheck source=./setup.conf
|
# shellcheck source=./setup.conf
|
||||||
|
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
|
||||||
|
|
||||||
CONFIG_FILE=$(pwd)/setup.conf
|
CONFIG_FILE="$SCRIPT_DIR"/setup.conf
|
||||||
if [[ -f "$CONFIG_FILE" ]]; then
|
if [[ -f "$CONFIG_FILE" ]]; then
|
||||||
source "$CONFIG_FILE"
|
source "$CONFIG_FILE"
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -222,7 +222,6 @@ background_check() {
|
||||||
echo -ne "ERROR! There seems to be no internet connection.\n"
|
echo -ne "ERROR! There seems to be no internet connection.\n"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
set_option "SCRIPT_DIR" "$SCRIPT_DIR"
|
|
||||||
check_arch
|
check_arch
|
||||||
check_pacman
|
check_pacman
|
||||||
efi_check
|
efi_check
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue