mirror of
https://gitlab.com/prism7/archery.git
synced 2025-02-15 08:29:17 +01:00
Indentation
This commit is contained in:
Jane Doe
parent
c956eb6c9a
commit
6f5d00893c
1 changed files with 19 additions and 22 deletions
41
Amelia.sh
41
Amelia.sh
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# Amelia Installer
|
||||
# https://gitlab.com/prism7/archery
|
||||
# Version: 8.3.2
|
||||
# Version: 8.3.3
|
||||
|
||||
set -euo pipefail
|
||||
###################################################################################################
|
||||
|
|
@ -99,7 +99,7 @@ ${deskpkgs}"
|
|||
}
|
||||
vm() {
|
||||
sleep 0.2
|
||||
RED "
|
||||
RED "
|
||||
----------------------------------
|
||||
### ${yellow}Virtual Machine detected ${red}###
|
||||
----------------------------------"
|
||||
|
|
@ -1019,7 +1019,7 @@ Enter a number: "
|
|||
###################################################################################################
|
||||
ask_bootldr() {
|
||||
|
||||
local prompt="Bootloader"
|
||||
local prompt="Bootloader Selection"
|
||||
sleep 0.2
|
||||
NC "
|
||||
|
||||
|
|
@ -1070,8 +1070,6 @@ Enter a number: "
|
|||
invalid
|
||||
return 1 ;;
|
||||
esac
|
||||
|
||||
local prompt="Bootloader Selection"
|
||||
ok
|
||||
}
|
||||
###################################################################################################
|
||||
|
|
@ -1409,7 +1407,7 @@ dtct_vga() {
|
|||
if [[ "${hypervisor}" != "none" ]]; then
|
||||
vm
|
||||
sleep 0.2
|
||||
YELLOW "
|
||||
YELLOW "
|
||||
|
||||
--> Graphics Setup skipped
|
||||
"
|
||||
|
|
@ -2069,11 +2067,11 @@ Enter any additional packages ${bwhite}(space-seperated)${blue}: "
|
|||
reload
|
||||
return 1
|
||||
elif [[ "${custompkgs}" =~ "lightdm" ]]; then
|
||||
echo
|
||||
sleep 0.2
|
||||
NC "
|
||||
|
||||
|
||||
|
||||
${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}LightDM Greeter Selection${nc} ${magenta}]${nc}--------------------------------${magenta}###
|
||||
"
|
||||
YELLOW "
|
||||
|
|
@ -5549,7 +5547,7 @@ XBOOTCTL
|
|||
fi
|
||||
elif [[ "${bootloader}" == "2" ]]; then
|
||||
local stage_prompt="Grub Configuration"
|
||||
if arch-chroot /mnt <<-GRUB > /dev/null 2>&1 2> amelia_log.txt ; then
|
||||
if arch-chroot /mnt <<-GRUB > /dev/null 2>&1 2> amelia_log.txt ; then
|
||||
cp /etc/default/grub /etc/default/grub.bak || exit
|
||||
cat <<-CFG > /etc/default/grub || exit
|
||||
GRUB_DEFAULT=0
|
||||
|
|
@ -5715,17 +5713,17 @@ mkinitcpio_preset() {
|
|||
if [[ ! -e "${esp_mount}"/EFI/Linux ]]; then
|
||||
mkdir -p "${esp_mount}"/EFI/Linux || exit
|
||||
fi
|
||||
if arch-chroot /mnt <<-UKI > /dev/null 2>&1 2> amelia_log.txt ; then
|
||||
mkdir /etc/cmdline.d || exit
|
||||
echo "rw ${boot_opts[*]}" | tee /etc/cmdline.d/cmdlined.conf || exit
|
||||
if arch-chroot /mnt <<-UKI > /dev/null 2>&1 2> amelia_log.txt ; then
|
||||
mkdir /etc/cmdline.d || exit
|
||||
echo "rw ${boot_opts[*]}" | tee /etc/cmdline.d/cmdlined.conf || exit
|
||||
cp /etc/mkinitcpio.d/${kernel}.preset /etc/mkinitcpio.d/${kernel}.preset.bak || exit
|
||||
cat <<-MKINITPRESET > /etc/mkinitcpio.d/${kernel}.preset || exit
|
||||
cat <<-MKINITPRESET > /etc/mkinitcpio.d/${kernel}.preset || exit
|
||||
ALL_kver="/boot/vmlinuz-${kernel}"
|
||||
PRESETS=('default')
|
||||
default_config="/etc/mkinitcpio.conf.d/mkinitcpiod.conf"
|
||||
default_uki="${btldr_esp_mount}/EFI/Linux/arch-${kernel}.efi"
|
||||
MKINITPRESET
|
||||
mkinitcpio -P || exit
|
||||
mkinitcpio -P || exit
|
||||
UKI
|
||||
stage_ok
|
||||
else
|
||||
|
|
@ -5733,16 +5731,15 @@ UKI
|
|||
fi
|
||||
|
||||
if [[ -e /mnt/boot/initramfs-"${kernel}".img ]]; then
|
||||
rm /mnt/boot/initramfs-"${kernel}".img || exit
|
||||
rm /mnt/boot/initramfs-"${kernel}".img || exit
|
||||
fi
|
||||
if [[ -e /mnt/boot/initramfs-"${kernel}"-fallback.img ]]; then
|
||||
rm /mnt/boot/initramfs-"${kernel}"-fallback.img || exit
|
||||
fi
|
||||
|
||||
rm /mnt/boot/initramfs-"${kernel}"-fallback.img || exit
|
||||
fi
|
||||
elif [[ "${uki}" == "n" ]]; then
|
||||
if arch-chroot /mnt <<-NOUKI > /dev/null 2>&1 2> amelia_log.txt ; then
|
||||
if arch-chroot /mnt <<-NOUKI > /dev/null 2>&1 2> amelia_log.txt ; then
|
||||
cp /etc/mkinitcpio.d/${kernel}.preset /etc/mkinitcpio.d/${kernel}.preset.bak || exit
|
||||
cat <<-MKINITPRESET > /etc/mkinitcpio.d/${kernel}.preset || exit
|
||||
cat <<-MKINITPRESET > /etc/mkinitcpio.d/${kernel}.preset || exit
|
||||
ALL_kver="/boot/vmlinuz-${kernel}"
|
||||
PRESETS=('default' 'fallback')
|
||||
default_config="/etc/mkinitcpio.conf.d/mkinitcpiod.conf"
|
||||
|
|
@ -5950,7 +5947,7 @@ set_vars() {
|
|||
# Mkinitcpio Modules
|
||||
mkinitcpio_mods="MODULES=()"
|
||||
# Mkinitcpio Hooks
|
||||
mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf kms keyboard sd-vconsole block filesystems fsck)"
|
||||
mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf kms keyboard sd-vconsole block filesystems fsck)"
|
||||
fi
|
||||
### Main Kernel Parameters
|
||||
boot_opts=()
|
||||
|
|
@ -6065,8 +6062,8 @@ NETWORK
|
|||
main_chroot
|
||||
|
||||
if [[ -f /mnt/etc/lightdm/lightdm.conf ]]; then
|
||||
if [[ "${greeternmbr}" == "1" ]]; then
|
||||
local stage_prompt="GTK Greeter Configuration"
|
||||
if [[ "${greeternmbr}" == "1" ]]; then
|
||||
local stage_prompt="GTK Greeter Configuration"
|
||||
if arch-chroot /mnt <<-GTK > /dev/null 2>&1 2> amelia_log.txt ; then
|
||||
sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-gtk-greeter|g' /etc/lightdm/lightdm.conf || exit
|
||||
GTK
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue