mirror of
https://gitlab.com/prism7/archery.git
synced 2026-04-28 01:17:35 +02:00
Change: Prompts have been edited for better aesthetics.
This commit is contained in:
Jane Doe
@@ -2,7 +2,7 @@
|
||||
|
||||
# Amelia Installer
|
||||
# Source: https://gitlab.com/prism7/archery
|
||||
# Version: 1.0.9
|
||||
# Version: 1.0.10
|
||||
|
||||
set -euo pipefail
|
||||
###################################################################################################
|
||||
@@ -62,9 +62,9 @@ alternatives() {
|
||||
}
|
||||
pkg_displ() {
|
||||
sleep 0.2
|
||||
NC "
|
||||
YELLOWL "
|
||||
|
||||
${green}Packages to be installed${nc}:
|
||||
Packages to be installed${nc}:
|
||||
|
||||
${deskpkgs}"
|
||||
}
|
||||
@@ -109,10 +109,10 @@ err_abort() {
|
||||
reboot() {
|
||||
if [[ "${luks_encrypt}" == "ok" ]]; then
|
||||
sleep 0.2
|
||||
RED "
|
||||
-------------------------------------------------------------------
|
||||
### ${nc}The system will now ${yellow}reboot ${nc}for all changes to take effect ${red}###
|
||||
-------------------------------------------------------------------
|
||||
CYAN "
|
||||
|
||||
>> ${nc}The system will now ${yellowl}reboot ${nc}for all changes to take effect
|
||||
|
||||
|
||||
|
||||
"
|
||||
@@ -122,10 +122,10 @@ reboot() {
|
||||
}
|
||||
force_reboot() {
|
||||
sleep 0.2
|
||||
RED "
|
||||
----------------------------------------------------------------
|
||||
### ${nc}A reboot is ${yellow}mandatory ${nc}after performing LUKS encryption ${red}###
|
||||
----------------------------------------------------------------
|
||||
CYAN "
|
||||
|
||||
>> ${nc}A reboot is ${yellowl}mandatory ${nc}after performing LUKS encryption
|
||||
|
||||
|
||||
|
||||
"
|
||||
@@ -5791,7 +5791,7 @@ ${magenta}###${nc}-------------------------------${magenta}[ ${bwhite}Confirm In
|
||||
###################################################################################################
|
||||
revise() {
|
||||
|
||||
reset=(xbootloader="" desktop="" terminal="" custompkgs="" customservices="" cust_bootopts="" REGDOM="" autoroot="" autoxboot="" autohome="" autoswap="" lowlat="" nogsp="" sanity="" partok="" preset="" set_optm="" ask_param="" kill_watchdog="" genoptm="" desk_setup="" devel="" web="" web_pkg="" web_aur="" web_slct="" set_optm_slct="" oomd="" irqbalance="" thermald="" rngd="" rtkit="" tlp="" CRYPTPASS="" CRYPTPASS2="" askoptm="" gptslct="" gptok="" gptabort="" nvdprop="" nowarning="" hometype="" homeform="" smartpart="")
|
||||
reset=(xbootloader="" desktop="" terminal="" custompkgs="" customservices="" cust_bootopts="" REGDOM="" autoroot="" autoxboot="" autohome="" autoswap="" lowlat="" nogsp="" sanity="" partok="" preset="" set_optm="" ask_param="" kill_watchdog="" genoptm="" desk_setup="" devel="" web="" web_pkg="" web_aur="" web_slct="" set_optm_slct="" oomd="" irqbalance="" thermald="" rngd="" rtkit="" tlp="" CRYPTPASS="" CRYPTPASS2="" askoptm="" gptslct="" gptok="" gptabort="" nvdprop="" nowarning="" hometype="" homeform="" smartpart="" LuksParts="")
|
||||
export "${reset[@]}"
|
||||
gfxpkgs=()
|
||||
|
||||
@@ -5868,10 +5868,9 @@ ${magenta}###${nc}-----------------------------------${magenta}[ ${bwhite}Secure
|
||||
YELLOW "
|
||||
|
||||
> Select a disk for Secure Erasure ${red}[!] (CAUTION) [!]${yellow} "
|
||||
RED "
|
||||
--------------------------------------------------------------------------
|
||||
### ${nc}A reboot is mandatory and will take effect ${yellowl}immediately ${nc}when done ${red}###
|
||||
--------------------------------------------------------------------------"
|
||||
CYAN "
|
||||
|
||||
>> ${nc}A reboot is mandatory and will take effect ${yellowl}immediately ${nc}when done "
|
||||
NC "
|
||||
|
||||
|
||||
@@ -5921,10 +5920,10 @@ luks() {
|
||||
|
||||
${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS Encryption${nc} ${magenta}]${nc}-------------------------------------${magenta}###
|
||||
"
|
||||
YELLOW "
|
||||
BLUE "
|
||||
|
||||
|
||||
> Encrypting selected partition(s):
|
||||
> Encrypting your ${yellowl}${LuksParts}:
|
||||
|
||||
"
|
||||
if echo -n "${CRYPTPASS}" | cryptsetup luksFormat --label CRYPTROOT "${root_dev}" > "${void}"; then
|
||||
@@ -6009,7 +6008,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
|
||||
else
|
||||
echo -n "${CRYPTPASS}" | cryptsetup luksOpen "${home_dev}" CryptHome || err_abort
|
||||
fi
|
||||
mkfs.ext4 -F -L Home /dev/mapper/CryptHome > "${void}" 2> "${log}" || err_abort
|
||||
mkfs.ext4 -F -L CryptHome /dev/mapper/CryptHome > "${void}" 2> "${log}" || err_abort
|
||||
tune2fs -O fast_commit /dev/mapper/CryptHome > "${void}" 2> "${log}" || err_abort
|
||||
mount --mkdir /dev/mapper/CryptHome /mnt/home > "${void}" 2> "${log}" || err_abort
|
||||
sleep 0.2
|
||||
@@ -7320,6 +7319,9 @@ set_vars() {
|
||||
###################################################################################################
|
||||
chroot_conf() {
|
||||
|
||||
if [[ "${swapmode}" == "2" ]]; then
|
||||
line2
|
||||
fi
|
||||
sleep 0.2
|
||||
NC "
|
||||
${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Chroot & Configure System${nc} ${magenta}]${nc}--------------------------------${magenta}###${nc}
|
||||
@@ -7468,7 +7470,7 @@ CUSTOM_SRVC
|
||||
log="Amelia.log"
|
||||
disks="$(lsblk --nodeps --paths --noheadings --output=name,size,model | cat --number)"
|
||||
trg=""
|
||||
vars=(LOCALESET="" SETLOCALE="" lcl_slct="" USERNAME="" kernelnmbr="" fs="" gfxcount="" gfxcard="" intelcount="" intelcards="" nvidiacount="" nvidiacards="" amdcount="" amdcards="" vendor="" vendors="" desktop="" terminal="" efi_entr_del="" sanity="" install="" bootldr_pkgs="" devel="" REGDOM="" gfx_bootopts="" btrfs_bootopts="" trim="" swapmode="" homecrypt="" greeter="" greeternmbr="" cust_bootopts="" vmpkgs="" vm_services="" perf_stream="" displaymanager="" wireless_reg="" bitness="" bootloader="" gfx_slct="" espsize="" autoroot="" autoesp="" autoxboot="" autohome="" autoswap="" rootprt="" espprt="" xbootprt="" homeprt="" swapprt="" partok="" instl_drive="" sgdsk_nmbr="" part_mode="" preset="" capacity="" cap_gib="" rootsize="" sgdrive="" cgdrive="" smartpart="" presetpart="" prcnt="" roottype="" stage_prompt="" zram="" xbootloader="" multibooting="" hypervisor="" mkinitcpio_mods="" mkinitcpio_bins="" uki="" ukify="" cng_espmnt="" sep_home="" encr_swap_bootopts="" uefimode="" luks_encrypt="" nrg_plc="" multilib="" nvname="" nogsp="" luks_root="" luks_swap="" luks_home="" installation="" kill_watchdog="" oomd="" setrescue="" lowlat="" dev="" web="" web_pkg="" web_aur="" web_slct="" printer="" print_pkgs="" shellnmbr="" shell="" shellname="" shellname2="" shell_pkgs="" genoptm="" set_optm="" ask_param="" desk_setup="" set_optm_slct="" irqbalance="" thermald="" rngd="" rtkit="" tlp="" CRYPTPASS="" CRYPTPASS2="" askoptm="" gptslct="" gptok="" gptabort="" nvdprop="" nowarning="" efiname="" path="" hometype="" homeform="")
|
||||
vars=(LOCALESET="" SETLOCALE="" lcl_slct="" USERNAME="" kernelnmbr="" fs="" gfxcount="" gfxcard="" intelcount="" intelcards="" nvidiacount="" nvidiacards="" amdcount="" amdcards="" vendor="" vendors="" desktop="" terminal="" efi_entr_del="" sanity="" install="" bootldr_pkgs="" devel="" REGDOM="" gfx_bootopts="" btrfs_bootopts="" trim="" swapmode="" homecrypt="" greeter="" greeternmbr="" cust_bootopts="" vmpkgs="" vm_services="" perf_stream="" displaymanager="" wireless_reg="" bitness="" bootloader="" gfx_slct="" espsize="" autoroot="" autoesp="" autoxboot="" autohome="" autoswap="" rootprt="" espprt="" xbootprt="" homeprt="" swapprt="" partok="" instl_drive="" sgdsk_nmbr="" part_mode="" preset="" capacity="" cap_gib="" rootsize="" sgdrive="" cgdrive="" smartpart="" presetpart="" prcnt="" roottype="" stage_prompt="" zram="" xbootloader="" multibooting="" hypervisor="" mkinitcpio_mods="" mkinitcpio_bins="" uki="" ukify="" cng_espmnt="" sep_home="" encr_swap_bootopts="" uefimode="" luks_encrypt="" nrg_plc="" multilib="" nvname="" nogsp="" luks_root="" luks_swap="" luks_home="" installation="" kill_watchdog="" oomd="" setrescue="" lowlat="" dev="" web="" web_pkg="" web_aur="" web_slct="" printer="" print_pkgs="" shellnmbr="" shell="" shellname="" shellname2="" shell_pkgs="" genoptm="" set_optm="" ask_param="" desk_setup="" set_optm_slct="" irqbalance="" thermald="" rngd="" rtkit="" tlp="" CRYPTPASS="" CRYPTPASS2="" askoptm="" gptslct="" gptok="" gptabort="" nvdprop="" nowarning="" efiname="" path="" hometype="" homeform="" LuksParts="")
|
||||
export "${vars[@]}"
|
||||
sleep 0.2
|
||||
CYANBG "************************************************************************************************* "
|
||||
|
||||
Reference in New Issue
Block a user