albert/archery
1
0
Fork 0
mirror of https://gitlab.com/prism7/archery.git synced 2025-02-15 08:29:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add: Export some variables

Browse source 
Change: Edit some prompts
This commit is contained in:
Jane Doe 2024-10-20 08:42:06 +00:00
parent 32a5253406
commit 8086f12ff3
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Amelia.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
# Amelia Installer
# Version: 8.0
# Version: 8.0.1
set -euo pipefail
###################################################################################################
@ -588,7 +588,7 @@ ${magenta}###${nc}------------------------------------${magenta}[ ${bwhite}Local
### [Enter ${nc}'l'${yellow} to list locales, then ${nc}'enter'${yellow} to search or ${nc}'q'${yellow} to quit]
### Exclude '.UTF_8' suffix "
### Exclude ${nc}'.UTF_8' ${yellow}suffix "
BLUE "
@ -1473,7 +1473,7 @@ dtct_single_vga() {
sleep 0.2
RED "
----------------------------------------------------
### ${yellow}Only for NV110 (Maxwell) Graphics or newer ${red}###
### ${yellow}Only for NV110 ${nc}(Maxwell) ${yellow}Graphics or newer ${red}###
----------------------------------------------------"
fi
YELLOW "
@ -1761,9 +1761,9 @@ Enter a number: "
if [[ "${swapmode}" == "3" || "${swapmode}" == "4" ]]; then
sleep 0.2
RED "
-----------------------------------------------------
### ${yellow}Incompatible Swap setting has been detected ${red}###
-----------------------------------------------------"
------------------------------------------------------
### ${yellow}Incompatible Swap setting have been detected ${red}###
------------------------------------------------------"
CYAN "
(*) ${nc}Nvidia's ${yellowl}'Suspend/Resume' ${nc}feature needs a valid ${yellowl}swapping ${nc}mechanism to work
@ -2025,7 +2025,7 @@ ${magenta}###${nc}------------------------------------${magenta}[ ${bwhite}Add Y
"
YELLOW "
### base, linux-firmware (if on bare-metal), sudo & your current choices are already included
### 'base', 'linux-firmware' (if on bare-metal), 'sudo' & your current choices are already included
"
BLUE "
@ -3563,7 +3563,7 @@ ${magenta}###${nc}------------------------------------${magenta}[ ${bwhite}Encry
--------------------------------------------------"
YELLOW "
### ESP cannot be mounted at '/efi' when using Grub on a LUKS formatted Root partition
### ESP cannot be mounted at '/efi' when using Grub on a LUKS encrypted Root partition
> Change ESP mountpoint to '/boot' instead ? [Y/n] "
@ -6087,7 +6087,7 @@ OPTIMIZED
tty="$(tty)"
disks="$(lsblk --nodeps --paths --noheadings --output=name,size,model | cat --number)"
trg=""
vars=(LOCALESET="" SETLOCALE="" lcl_slct="" USERNAME="" kernelnmbr="" fs="" vga_setup="" vendor1="" vendor2="" vendor3="" vendor_slct="" packages="" efi_entr_del="" wrlss_rgd="" sanity="" install="" bootldr_pkgs="" devel="" REGDOM="" vga_bootopts="" btrfs_bootopts="" trim="" swapmode="" homecrypt="" greeter="" revision="" greeternmbr="" cust_bootopts="" bluetooth="" vmpkgs="" vm_services="" perf_stream="" displaymanager="" wireless_reg="" bootmode="" bootloader="" vga_slct="" espsize="" autoroot="" autoesp="" autoxboot="" autohome="" autoswap="" rootprt="" espprt="" xbootprt="" homeprt="" swapprt="" partok="" use_manpreset="" instl_drive="" sgdsk_nmbr="" part_mode="" preset="" capacity="" cap_gib="" rootsize="" sgdrive="" cgdrive="" smartpart="" presetpart="" prcnt="" roottype="" stage_prompt="" zram="" zram_bootopts="" xbootloader="" multibooting="" hypervisor="" mkinitcpio_mods="" uki="" ukify="" slct_autoprt="" cng_espmnt="" sep_home="" encr_swap_bootopts="")
vars=(LOCALESET="" SETLOCALE="" lcl_slct="" USERNAME="" kernelnmbr="" fs="" vgapkgs="" vgacount="" vgacard="" intelcount="" intelcards="" nvidiacount="" nvidiacards="" amdcount="" amdcards="" vgaconf="" vga_conf="" vga_setup="" vendor="" vendor1="" vendor2="" vendor3="" vendor_slct="" packages="" efi_entr_del="" wrlss_rgd="" sanity="" install="" bootldr_pkgs="" devel="" REGDOM="" vga_bootopts="" btrfs_bootopts="" trim="" swapmode="" homecrypt="" greeter="" revision="" greeternmbr="" cust_bootopts="" bluetooth="" vmpkgs="" vm_services="" perf_stream="" displaymanager="" wireless_reg="" bootmode="" bootloader="" vga_slct="" espsize="" autoroot="" autoesp="" autoxboot="" autohome="" autoswap="" rootprt="" espprt="" xbootprt="" homeprt="" swapprt="" partok="" use_manpreset="" instl_drive="" sgdsk_nmbr="" part_mode="" preset="" capacity="" cap_gib="" rootsize="" sgdrive="" cgdrive="" smartpart="" presetpart="" prcnt="" roottype="" stage_prompt="" zram="" zram_bootopts="" xbootloader="" multibooting="" hypervisor="" mkinitcpio_mods="" uki="" ukify="" slct_autoprt="" cng_espmnt="" sep_home="" encr_swap_bootopts="")
export "${vars[@]}"
clear
first_check