mirror of
https://gitlab.com/prism7/archery.git
synced 2026-04-28 01:17:35 +02:00
Change: Code replacement for efficiency
Change: Prompts have been edited for better aesthetics
This commit is contained in:
Jane Doe
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# Amelia Installer
|
# Amelia Installer
|
||||||
# Source: https://gitlab.com/prism7/archery
|
# Source: https://gitlab.com/prism7/archery
|
||||||
# Version: 1.0.11
|
# Version: 1.0.12
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
@@ -44,9 +44,10 @@ NC() { echo -e "${nc} $1${nc}" ;}
|
|||||||
# PROMPT FUNCTIONS
|
# PROMPT FUNCTIONS
|
||||||
skip() {
|
skip() {
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
YELLOW "
|
YELLOWL "
|
||||||
|
|
||||||
--> Skipping.. "
|
--> Skipping..
|
||||||
|
"
|
||||||
}
|
}
|
||||||
reload() {
|
reload() {
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
@@ -284,6 +285,16 @@ Enter [Y/n]: "
|
|||||||
until term_offer; do : ; done ;;
|
until term_offer; do : ; done ;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
keypress() {
|
||||||
|
NC "
|
||||||
|
|
||||||
|
|
||||||
|
${bwhite}Press any key to continue${nc}
|
||||||
|
|
||||||
|
|
||||||
|
"
|
||||||
|
read -r -s -n 1
|
||||||
|
}
|
||||||
amd() {
|
amd() {
|
||||||
line2
|
line2
|
||||||
REDBG " ------------------------------- "
|
REDBG " ------------------------------- "
|
||||||
@@ -384,12 +395,14 @@ mode_check() {
|
|||||||
sleep 0.2
|
sleep 0.2
|
||||||
YELLOWL "
|
YELLOWL "
|
||||||
|
|
||||||
> ${nc}Running in ${red}ROOT ${nc}mode ${yellowl}< "
|
|
||||||
|
> ${nc}Running in ${red}ROOT ${nc}mode ${yellowl}< "
|
||||||
else
|
else
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
YELLOWL "
|
YELLOWL "
|
||||||
|
|
||||||
> ${nc}Running in ${blue}DEMO ${nc}mode ${yellowl}< "
|
|
||||||
|
> ${nc}Running in ${blue}DEMO ${nc}mode ${yellowl}< "
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
@@ -1192,8 +1205,11 @@ Enter [y/N]: "
|
|||||||
sleep 0.2
|
sleep 0.2
|
||||||
RED "
|
RED "
|
||||||
-----------------------------------------
|
-----------------------------------------
|
||||||
### ${nc}Secure Boot Not in ${yellow}'Setup' ${nc}Mode ${red}###
|
### ${nc}Secure Boot Not in ${yellowl}'Setup' ${nc}Mode ${red}###
|
||||||
-----------------------------------------"
|
-----------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
"
|
||||||
failure
|
failure
|
||||||
fi
|
fi
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
@@ -1438,49 +1454,47 @@ Enter [y/N]: "
|
|||||||
sep_home="${sep_home:-n}"
|
sep_home="${sep_home:-n}"
|
||||||
sep_home="${sep_home,,}"
|
sep_home="${sep_home,,}"
|
||||||
|
|
||||||
case "${sep_home}" in
|
case "${sep_home}" in
|
||||||
y)
|
y)
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
YELLOW "
|
YELLOW "
|
||||||
|
|
||||||
> Make a selection: "
|
> Make a selection: "
|
||||||
NC "
|
NC "
|
||||||
|
|
||||||
[1] Create a /Home partition
|
[1] Create a /Home partition
|
||||||
|
|
||||||
[2] Utilize a previously used unencrypted /Home partition "
|
[2] Utilize a previously used unencrypted /Home partition "
|
||||||
BLUE "
|
BLUE "
|
||||||
|
|
||||||
|
|
||||||
Enter a number: "
|
Enter a number: "
|
||||||
read -r -p "
|
read -r -p "
|
||||||
==> " hometype
|
==> " hometype
|
||||||
echo
|
echo
|
||||||
case "${hometype}" in
|
case "${hometype}" in
|
||||||
1)
|
1)
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
YELLOW "
|
YELLOW "
|
||||||
|
|
||||||
### A /Home Partition will be created " ;;
|
### A /Home Partition will be created " ;;
|
||||||
2)
|
2)
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
YELLOW "
|
YELLOW "
|
||||||
|
|
||||||
### An existing /Home Partition will be used " ;;
|
### An existing /Home Partition will be used " ;;
|
||||||
*) invalid
|
*) invalid
|
||||||
return 1 ;;
|
return 1 ;;
|
||||||
esac ;;
|
esac ;;
|
||||||
n)
|
n)
|
||||||
skip
|
skip ;;
|
||||||
echo;;
|
*)
|
||||||
*)
|
invalid
|
||||||
invalid
|
return 1 ;;
|
||||||
return 1 ;;
|
esac
|
||||||
esac
|
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
YELLOW "
|
YELLOW "
|
||||||
|
|
||||||
|
|
||||||
### ${fsname} has been selected
|
### ${fsname} has been selected
|
||||||
" ;;
|
" ;;
|
||||||
2)
|
2)
|
||||||
@@ -1510,7 +1524,7 @@ Enter a name: "
|
|||||||
invalid
|
invalid
|
||||||
return 1
|
return 1
|
||||||
fi ;;
|
fi ;;
|
||||||
"")
|
"")
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
RED "
|
RED "
|
||||||
------------------------------------
|
------------------------------------
|
||||||
@@ -1585,7 +1599,8 @@ Enter a number ${bwhite}(empty to skip)${blue}: "
|
|||||||
sleep 0.2
|
sleep 0.2
|
||||||
YELLOW "
|
YELLOW "
|
||||||
|
|
||||||
### No Swap will be used "
|
### No Swap will be used
|
||||||
|
"
|
||||||
skip ;;
|
skip ;;
|
||||||
*)
|
*)
|
||||||
invalid
|
invalid
|
||||||
@@ -1949,6 +1964,9 @@ Enter [Y/n]: "
|
|||||||
"
|
"
|
||||||
local prompt="Graphics Setup"
|
local prompt="Graphics Setup"
|
||||||
ok
|
ok
|
||||||
|
if [[ "${install}" == "yes" ]]; then
|
||||||
|
keypress
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
gfxpkgs_set() {
|
gfxpkgs_set() {
|
||||||
@@ -1981,13 +1999,7 @@ gfxpkgs_set() {
|
|||||||
|
|
||||||
### ${nc}is incompatible with ${yellowl}'Early KMS' ${nc}use ${cyan}###${nc}
|
### ${nc}is incompatible with ${yellowl}'Early KMS' ${nc}use ${cyan}###${nc}
|
||||||
----------------------------------------------------------------"
|
----------------------------------------------------------------"
|
||||||
NC "
|
keypress
|
||||||
|
|
||||||
|
|
||||||
${bwhite}Press any key to continue${nc}
|
|
||||||
|
|
||||||
"
|
|
||||||
read -r -s -n 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
gfxpkgs=(libva-mesa-driver libva-nvidia-driver libvdpau-va-gl nvidia-settings nvidia-utils opencl-nvidia opencl-headers vkd3d)
|
gfxpkgs=(libva-mesa-driver libva-nvidia-driver libvdpau-va-gl nvidia-settings nvidia-utils opencl-nvidia opencl-headers vkd3d)
|
||||||
@@ -2325,27 +2337,32 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}'base-dev
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
> Install 'base-devel' meta-package ? [Y/n] "
|
> Install 'base-devel' meta-package ? [y/N] "
|
||||||
BLUE "
|
BLUE "
|
||||||
|
|
||||||
|
|
||||||
Enter [Y/n]: "
|
Enter [y/N]: "
|
||||||
read -r -p "
|
read -r -p "
|
||||||
==> " dev
|
==> " dev
|
||||||
|
|
||||||
dev="${dev:-y}"
|
echo
|
||||||
|
dev="${dev:-n}"
|
||||||
dev="${dev,,}"
|
dev="${dev,,}"
|
||||||
|
|
||||||
case "${dev}" in
|
case "${dev}" in
|
||||||
y)
|
y)
|
||||||
devel="base-devel"
|
devel="base-devel"
|
||||||
ok ;;
|
YELLOW "
|
||||||
n)
|
|
||||||
skip ;;
|
### The 'base-devel' meta-package will be installed
|
||||||
*)
|
" ;;
|
||||||
invalid
|
n)
|
||||||
return 1 ;;
|
skip ;;
|
||||||
esac
|
*)
|
||||||
|
invalid
|
||||||
|
return 1 ;;
|
||||||
|
esac
|
||||||
|
ok
|
||||||
}
|
}
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
web_browser() {
|
web_browser() {
|
||||||
@@ -2358,6 +2375,7 @@ ${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Web bro
|
|||||||
"
|
"
|
||||||
|
|
||||||
if [[ ! "${desktop}" =~ ^(11|12)$ && -n "${desktop}" ]]; then
|
if [[ ! "${desktop}" =~ ^(11|12)$ && -n "${desktop}" ]]; then
|
||||||
|
local prompt="Web Browser"
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
YELLOW "
|
YELLOW "
|
||||||
|
|
||||||
@@ -2391,6 +2409,7 @@ Enter a number ${bwhite}(empty to skip)${blue}: "
|
|||||||
read -r -p "
|
read -r -p "
|
||||||
==> " web
|
==> " web
|
||||||
|
|
||||||
|
echo
|
||||||
case "${web}" in
|
case "${web}" in
|
||||||
1)
|
1)
|
||||||
web_pkg="firefox"
|
web_pkg="firefox"
|
||||||
@@ -2421,7 +2440,8 @@ Enter a number ${bwhite}(empty to skip)${blue}: "
|
|||||||
web_aur=""
|
web_aur=""
|
||||||
web_name=""
|
web_name=""
|
||||||
web_slct="yes"
|
web_slct="yes"
|
||||||
skip ;;
|
skip
|
||||||
|
ok ;;
|
||||||
*)
|
*)
|
||||||
invalid
|
invalid
|
||||||
return 1 ;;
|
return 1 ;;
|
||||||
@@ -2445,14 +2465,7 @@ Enter a number ${bwhite}(empty to skip)${blue}: "
|
|||||||
web_name=""
|
web_name=""
|
||||||
web_slct=""
|
web_slct=""
|
||||||
skip
|
skip
|
||||||
NC "
|
keypress
|
||||||
|
|
||||||
|
|
||||||
${bwhite}Press any key to continue${nc}
|
|
||||||
|
|
||||||
|
|
||||||
"
|
|
||||||
read -r -s -n 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "${web}" =~ ^(1|2|3|4|5|6|7|8)$ ]]; then
|
if [[ "${web}" =~ ^(1|2|3|4|5|6|7|8)$ ]]; then
|
||||||
@@ -2489,6 +2502,7 @@ Enter [y/N]: "
|
|||||||
read -r -p "
|
read -r -p "
|
||||||
==> " printer
|
==> " printer
|
||||||
|
|
||||||
|
echo
|
||||||
printer="${printer:-n}"
|
printer="${printer:-n}"
|
||||||
printer="${printer,,}"
|
printer="${printer,,}"
|
||||||
|
|
||||||
@@ -2500,8 +2514,7 @@ Enter [y/N]: "
|
|||||||
print_pkgs="bluez-cups cups-pdf cups-browsed cups-pk-helper foomatic-db-gutenprint-ppds gutenprint ipp-usb libusb nss-mdns sane-airscan simple-scan system-config-printer xdg-utils colord"
|
print_pkgs="bluez-cups cups-pdf cups-browsed cups-pk-helper foomatic-db-gutenprint-ppds gutenprint ipp-usb libusb nss-mdns sane-airscan simple-scan system-config-printer xdg-utils colord"
|
||||||
else
|
else
|
||||||
print_pkgs="bluez-cups cups-pdf cups-browsed cups-pk-helper foomatic-db-gutenprint-ppds gutenprint ipp-usb libusb nss-mdns sane-airscan system-config-printer xdg-utils colord"
|
print_pkgs="bluez-cups cups-pdf cups-browsed cups-pk-helper foomatic-db-gutenprint-ppds gutenprint ipp-usb libusb nss-mdns sane-airscan system-config-printer xdg-utils colord"
|
||||||
fi
|
fi ;;
|
||||||
ok ;;
|
|
||||||
n)
|
n)
|
||||||
print_pkgs=""
|
print_pkgs=""
|
||||||
skip ;;
|
skip ;;
|
||||||
@@ -2509,6 +2522,7 @@ Enter [y/N]: "
|
|||||||
invalid
|
invalid
|
||||||
return 1 ;;
|
return 1 ;;
|
||||||
esac
|
esac
|
||||||
|
ok
|
||||||
else
|
else
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
RED "
|
RED "
|
||||||
@@ -2524,20 +2538,15 @@ Enter [y/N]: "
|
|||||||
"
|
"
|
||||||
print_pkgs=""
|
print_pkgs=""
|
||||||
skip
|
skip
|
||||||
NC "
|
ok
|
||||||
|
keypress
|
||||||
|
|
||||||
${bwhite}Press any key to continue${nc}
|
|
||||||
|
|
||||||
|
|
||||||
"
|
|
||||||
read -r -s -n 1
|
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo
|
echo
|
||||||
vm
|
vm
|
||||||
print_pkgs=""
|
print_pkgs=""
|
||||||
skip
|
skip
|
||||||
|
ok
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
@@ -2577,30 +2586,32 @@ Enter a Boot Entry number for Deletion ${bwhite}(empty to skip)${blue}:
|
|||||||
${cyan}Entries: ${yellowl}${entrnmbr} "
|
${cyan}Entries: ${yellowl}${entrnmbr} "
|
||||||
read -r -p "
|
read -r -p "
|
||||||
==> " boot_entry
|
==> " boot_entry
|
||||||
|
echo
|
||||||
|
|
||||||
if [[ -n "${boot_entry}" ]]; then
|
if [[ -n "${boot_entry}" ]]; then
|
||||||
if [[ "${run_as}" != "root" ]]; then
|
if [[ "${run_as}" != "root" ]]; then
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
RED "
|
RED "
|
||||||
-----------------------------------
|
-----------------------------------
|
||||||
### ${nc}Root Privileges Missing.. ${red}###
|
### ${nc}Root Privileges Missing.. ${red}###
|
||||||
-----------------------------------"
|
-----------------------------------
|
||||||
reload
|
"
|
||||||
until sys_submn; do : ; done
|
reload
|
||||||
fi
|
until sys_submn; do : ; done
|
||||||
if efibootmgr -b "${boot_entry}" -B --unicode; then
|
fi
|
||||||
sleep 0.2
|
if efibootmgr -b "${boot_entry}" -B --unicode; then
|
||||||
NC "
|
sleep 0.2
|
||||||
|
NC "
|
||||||
|
|
||||||
==> [${green}Entry ${boot_entry} Deleted${nc}] "
|
==> [${green}Entry ${boot_entry} Deleted${nc}] "
|
||||||
else
|
|
||||||
err_try
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
skip
|
err_try
|
||||||
ok
|
return 1
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
skip
|
||||||
|
ok
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
efi_entr_del="yes"
|
efi_entr_del="yes"
|
||||||
}
|
}
|
||||||
@@ -2680,7 +2691,6 @@ Enter a number: "
|
|||||||
until tlp; do : ; done
|
until tlp; do : ; done
|
||||||
return 1 ;;
|
return 1 ;;
|
||||||
"")
|
"")
|
||||||
set_optm_slct="yes"
|
|
||||||
until sys_submn; do : ; done ;;
|
until sys_submn; do : ; done ;;
|
||||||
*)
|
*)
|
||||||
invalid
|
invalid
|
||||||
@@ -2703,23 +2713,25 @@ Enter [y/N]: "
|
|||||||
read -r -p "
|
read -r -p "
|
||||||
==> " askoptm
|
==> " askoptm
|
||||||
|
|
||||||
|
echo
|
||||||
askoptm="${askoptm:-n}"
|
askoptm="${askoptm:-n}"
|
||||||
askoptm="${askoptm,,}"
|
askoptm="${askoptm,,}"
|
||||||
|
|
||||||
if [[ "${askoptm}" == "n" ]]; then
|
if [[ "${askoptm}" == "n" ]]; then
|
||||||
skip
|
skip
|
||||||
|
ok
|
||||||
elif [[ "${askoptm}" == "y" ]]; then
|
elif [[ "${askoptm}" == "y" ]]; then
|
||||||
return 0
|
return 0
|
||||||
else
|
else
|
||||||
invalid
|
invalid
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
ok
|
|
||||||
}
|
}
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
cust_kern_param() {
|
cust_kern_param() {
|
||||||
|
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
|
local prompt="Custom Kernel Parameters"
|
||||||
NC "
|
NC "
|
||||||
|
|
||||||
|
|
||||||
@@ -2741,23 +2753,25 @@ Enter [y/N]: "
|
|||||||
read -r -p "
|
read -r -p "
|
||||||
==> " ask_param
|
==> " ask_param
|
||||||
|
|
||||||
|
echo
|
||||||
ask_param="${ask_param:-n}"
|
ask_param="${ask_param:-n}"
|
||||||
ask_param="${ask_param,,}"
|
ask_param="${ask_param,,}"
|
||||||
|
|
||||||
case "${ask_param}" in
|
case "${ask_param}" in
|
||||||
y)
|
y)
|
||||||
until add_prmtrs; do : ; done ;;
|
until add_prmtrs; do : ; done ;;
|
||||||
n)
|
n)
|
||||||
skip ;;
|
skip
|
||||||
*)
|
ok ;;
|
||||||
invalid
|
*)
|
||||||
return 1 ;;
|
invalid
|
||||||
esac
|
return 1 ;;
|
||||||
|
esac
|
||||||
}
|
}
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
add_prmtrs() {
|
add_prmtrs() {
|
||||||
|
|
||||||
local prompt="Kernel Parameters"
|
local prompt="Custom Kernel Parameters"
|
||||||
YELLOW "
|
YELLOW "
|
||||||
|
|
||||||
|
|
||||||
@@ -2774,6 +2788,7 @@ Enter your own Kernel parameters to be set at boot ${bwhite}(space-seperated)${b
|
|||||||
|
|
||||||
if [[ -z "${cust_bootopts}" ]]; then
|
if [[ -z "${cust_bootopts}" ]]; then
|
||||||
skip
|
skip
|
||||||
|
ok
|
||||||
else
|
else
|
||||||
ok
|
ok
|
||||||
fi
|
fi
|
||||||
@@ -2782,6 +2797,7 @@ Enter your own Kernel parameters to be set at boot ${bwhite}(space-seperated)${b
|
|||||||
sys_watchdog() {
|
sys_watchdog() {
|
||||||
|
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
|
local prompt="System Watchdogs"
|
||||||
NC "
|
NC "
|
||||||
|
|
||||||
|
|
||||||
@@ -2808,24 +2824,29 @@ Enter [y/N]: "
|
|||||||
read -r -p "
|
read -r -p "
|
||||||
==> " kill_watchdog
|
==> " kill_watchdog
|
||||||
|
|
||||||
|
echo
|
||||||
kill_watchdog="${kill_watchdog:-n}"
|
kill_watchdog="${kill_watchdog:-n}"
|
||||||
kill_watchdog="${kill_watchdog,,}"
|
kill_watchdog="${kill_watchdog,,}"
|
||||||
|
|
||||||
case "${kill_watchdog}" in
|
case "${kill_watchdog}" in
|
||||||
y)
|
y)
|
||||||
local prompt="Watchdogs Disabled"
|
YELLOW "
|
||||||
ok ;;
|
|
||||||
n)
|
### Watchdogs will be disabled
|
||||||
skip ;;
|
" ;;
|
||||||
*)
|
n)
|
||||||
invalid
|
skip ;;
|
||||||
return 1 ;;
|
*)
|
||||||
esac
|
invalid
|
||||||
|
return 1 ;;
|
||||||
|
esac
|
||||||
|
ok
|
||||||
}
|
}
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
gen_optm() {
|
gen_optm() {
|
||||||
|
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
|
local prompt="System Optimizations"
|
||||||
NC "
|
NC "
|
||||||
|
|
||||||
|
|
||||||
@@ -2850,22 +2871,26 @@ Enter [v/y/N]: "
|
|||||||
read -r -p "
|
read -r -p "
|
||||||
==> " genoptm
|
==> " genoptm
|
||||||
|
|
||||||
|
echo
|
||||||
genoptm="${genoptm:-n}"
|
genoptm="${genoptm:-n}"
|
||||||
genoptm="${genoptm,,}"
|
genoptm="${genoptm,,}"
|
||||||
|
|
||||||
case "${genoptm}" in
|
case "${genoptm}" in
|
||||||
y)
|
y)
|
||||||
local prompt="System Optimizations"
|
YELLOW "
|
||||||
ok ;;
|
|
||||||
n)
|
### System Optimizations will be set
|
||||||
skip ;;
|
" ;;
|
||||||
v)
|
n)
|
||||||
view_optm
|
skip ;;
|
||||||
return 1 ;;
|
v)
|
||||||
*)
|
view_optm
|
||||||
invalid
|
return 1 ;;
|
||||||
return 1 ;;
|
*)
|
||||||
esac
|
invalid
|
||||||
|
return 1 ;;
|
||||||
|
esac
|
||||||
|
ok
|
||||||
}
|
}
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
ask_wireless_regdom() {
|
ask_wireless_regdom() {
|
||||||
@@ -2905,6 +2930,7 @@ Enter your Country Code, ie:${nc} ${cyan}US ${bwhite}(empty to skip)${blue}: "
|
|||||||
read -r -p "
|
read -r -p "
|
||||||
==> " REGDOM
|
==> " REGDOM
|
||||||
|
|
||||||
|
echo
|
||||||
REGDOM="${REGDOM^^}"
|
REGDOM="${REGDOM^^}"
|
||||||
|
|
||||||
if [[ -z "${REGDOM}" ]]; then
|
if [[ -z "${REGDOM}" ]]; then
|
||||||
@@ -3304,9 +3330,11 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
|
|||||||
if [[ "${run_as}" != "root" ]]; then
|
if [[ "${run_as}" != "root" ]]; then
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
RED "
|
RED "
|
||||||
|
|
||||||
-----------------------------------
|
-----------------------------------
|
||||||
### ${nc}Root Privileges Missing.. ${red}###
|
### ${nc}Root Privileges Missing.. ${red}###
|
||||||
-----------------------------------"
|
-----------------------------------
|
||||||
|
"
|
||||||
reload
|
reload
|
||||||
until dsks_submn; do : ; done
|
until dsks_submn; do : ; done
|
||||||
fi
|
fi
|
||||||
@@ -3550,7 +3578,8 @@ ${magenta}###${nc}---------------------------------${magenta}[ ${bwhite}Automati
|
|||||||
RED "
|
RED "
|
||||||
-----------------------------------
|
-----------------------------------
|
||||||
### ${nc}Root Privileges Missing.. ${red}###
|
### ${nc}Root Privileges Missing.. ${red}###
|
||||||
-----------------------------------"
|
-----------------------------------
|
||||||
|
"
|
||||||
reload
|
reload
|
||||||
until main_menu; do : ; done
|
until main_menu; do : ; done
|
||||||
return 0
|
return 0
|
||||||
@@ -3611,7 +3640,8 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
|
|||||||
RED "
|
RED "
|
||||||
-----------------------------------
|
-----------------------------------
|
||||||
### ${nc}Root Privileges Missing.. ${red}###
|
### ${nc}Root Privileges Missing.. ${red}###
|
||||||
-----------------------------------"
|
-----------------------------------
|
||||||
|
"
|
||||||
reload
|
reload
|
||||||
until dsks_submn; do : ; done
|
until dsks_submn; do : ; done
|
||||||
return 0
|
return 0
|
||||||
@@ -3879,9 +3909,12 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
|
|||||||
if [[ "${run_as}" != "root" ]]; then
|
if [[ "${run_as}" != "root" ]]; then
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
RED "
|
RED "
|
||||||
|
|
||||||
|
|
||||||
-----------------------------------
|
-----------------------------------
|
||||||
### ${nc}Root Privileges Missing.. ${red}###
|
### ${nc}Root Privileges Missing.. ${red}###
|
||||||
-----------------------------------"
|
-----------------------------------
|
||||||
|
"
|
||||||
reload
|
reload
|
||||||
until dsks_submn; do : ; done
|
until dsks_submn; do : ; done
|
||||||
fi
|
fi
|
||||||
@@ -3941,7 +3974,8 @@ Enter a disk number: "
|
|||||||
RED "
|
RED "
|
||||||
-----------------------------------
|
-----------------------------------
|
||||||
### ${nc}Root Privileges Missing.. ${red}###
|
### ${nc}Root Privileges Missing.. ${red}###
|
||||||
-----------------------------------"
|
-----------------------------------
|
||||||
|
"
|
||||||
reload
|
reload
|
||||||
until main_menu; do : ; done
|
until main_menu; do : ; done
|
||||||
return 0
|
return 0
|
||||||
@@ -4297,16 +4331,9 @@ ${multi_swap}
|
|||||||
>> ${yellowl}WARNING: ${nc}/Root's size might not be adequate " #ATTENTION
|
>> ${yellowl}WARNING: ${nc}/Root's size might not be adequate " #ATTENTION
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
CYAN "
|
CYAN "
|
||||||
>> ${nc}Depending on the ${yellowl}size ${nc}of your setup, installation might ${yellowl}fail " #ATTENTION
|
>> ${nc}Depending on the ${yellowl}size ${nc}of your setup, installation might ${yellowl}fail
|
||||||
NC "
|
" #ATTENTION
|
||||||
|
keypress
|
||||||
|
|
||||||
|
|
||||||
${bwhite}Press any key to continue${nc}
|
|
||||||
|
|
||||||
|
|
||||||
"
|
|
||||||
read -r -s -n 1
|
|
||||||
fi
|
fi
|
||||||
if [[ "${autoroot}" == "y" ]]; then
|
if [[ "${autoroot}" == "y" ]]; then
|
||||||
if [[ "${presetpart}" == "y" || "${smartpart}" == "y" ]]; then
|
if [[ "${presetpart}" == "y" || "${smartpart}" == "y" ]]; then
|
||||||
@@ -4582,16 +4609,9 @@ ${multi_swap}
|
|||||||
|
|
||||||
-----------------------------
|
-----------------------------
|
||||||
### ${bwhite}SANITY CHECK FAILED ${nc}${red}###
|
### ${bwhite}SANITY CHECK FAILED ${nc}${red}###
|
||||||
-----------------------------"
|
-----------------------------
|
||||||
NC "
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
${bwhite}Press any key to continue${nc}
|
|
||||||
|
|
||||||
|
|
||||||
"
|
"
|
||||||
read -r -s -n 1
|
keypress
|
||||||
|
|
||||||
if [[ "${multibooting}" == "y" ]]; then
|
if [[ "${multibooting}" == "y" ]]; then
|
||||||
if [[ "${espprt}" == "fail" && -e "${esp_dev}" ]]; then
|
if [[ "${espprt}" == "fail" && -e "${esp_dev}" ]]; then
|
||||||
@@ -4613,12 +4633,7 @@ ${multi_swap}
|
|||||||
>> ${nc}Create a ${yellowl}300M ${nc}(at minimum) Linux Extended Boot Partition ${bwhite}(XBOOTLDR) ${yellowl}[GUID CODE: ea00]
|
>> ${nc}Create a ${yellowl}300M ${nc}(at minimum) Linux Extended Boot Partition ${bwhite}(XBOOTLDR) ${yellowl}[GUID CODE: ea00]
|
||||||
" #ATTENTION
|
" #ATTENTION
|
||||||
fi
|
fi
|
||||||
NC "
|
keypress
|
||||||
|
|
||||||
|
|
||||||
${bwhite}Press any key to continue${nc}
|
|
||||||
"
|
|
||||||
read -r -s -n 1
|
|
||||||
|
|
||||||
if [[ "${espmnt}" == "2" ]]; then
|
if [[ "${espmnt}" == "2" ]]; then
|
||||||
until slct_espmnt; do : ; done
|
until slct_espmnt; do : ; done
|
||||||
@@ -4846,7 +4861,7 @@ instl() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z "${set_optm_slct}" ]]; then
|
if [[ -z "${askoptm}" ]]; then
|
||||||
local stage_prompt="Optimizations"
|
local stage_prompt="Optimizations"
|
||||||
completion_err
|
completion_err
|
||||||
until ask_optm; do : ; done
|
until ask_optm; do : ; done
|
||||||
@@ -5798,7 +5813,7 @@ ${magenta}###${nc}-------------------------------${magenta}[ ${bwhite}Confirm In
|
|||||||
###################################################################################################
|
###################################################################################################
|
||||||
revise() {
|
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="" LuksParts="")
|
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="" oomd="" irqbalance="" thermald="" rngd="" rtkit="" tlp="" CRYPTPASS="" CRYPTPASS2="" askoptm="" gptslct="" gptok="" gptabort="" nvdprop="" nowarning="" hometype="" homeform="" smartpart="" LuksParts="")
|
||||||
export "${reset[@]}"
|
export "${reset[@]}"
|
||||||
gfxpkgs=()
|
gfxpkgs=()
|
||||||
|
|
||||||
@@ -6040,14 +6055,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
|
|||||||
> An existing /Home partition has been detected and will be utilized in this installation
|
> An existing /Home partition has been detected and will be utilized in this installation
|
||||||
|
|
||||||
"
|
"
|
||||||
NC "
|
keypress
|
||||||
|
|
||||||
|
|
||||||
${bwhite}Press any key to continue${nc}
|
|
||||||
|
|
||||||
|
|
||||||
"
|
|
||||||
read -r -s -n 1
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -6322,15 +6330,8 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
pkg_displ
|
pkg_displ
|
||||||
NC "
|
echo
|
||||||
|
keypress
|
||||||
|
|
||||||
|
|
||||||
${bwhite}Press any key to continue${nc}
|
|
||||||
|
|
||||||
|
|
||||||
"
|
|
||||||
read -r -s -n 1
|
|
||||||
|
|
||||||
if pacstrap -K /mnt ${deskpkgs} 2> "${log}" ; then
|
if pacstrap -K /mnt ${deskpkgs} 2> "${log}" ; then
|
||||||
local prompt="Pacstrap System"
|
local prompt="Pacstrap System"
|
||||||
@@ -7478,7 +7479,7 @@ CUSTOM_SRVC
|
|||||||
log="Amelia.log"
|
log="Amelia.log"
|
||||||
disks="$(lsblk --nodeps --paths --noheadings --output=name,size,model | cat --number)"
|
disks="$(lsblk --nodeps --paths --noheadings --output=name,size,model | cat --number)"
|
||||||
trg=""
|
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="" LuksParts="")
|
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="" irqbalance="" thermald="" rngd="" rtkit="" tlp="" CRYPTPASS="" CRYPTPASS2="" askoptm="" gptslct="" gptok="" gptabort="" nvdprop="" nowarning="" efiname="" path="" hometype="" homeform="" LuksParts="")
|
||||||
export "${vars[@]}"
|
export "${vars[@]}"
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
CYANBG "************************************************************************************************* "
|
CYANBG "************************************************************************************************* "
|
||||||
@@ -7487,17 +7488,9 @@ CUSTOM_SRVC
|
|||||||
CYANBG " "
|
CYANBG " "
|
||||||
CYANBG "************************************************************************************************* "
|
CYANBG "************************************************************************************************* "
|
||||||
mode_check
|
mode_check
|
||||||
NC "
|
line3
|
||||||
|
line3
|
||||||
|
keypress
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
${bwhite}Press any key to start${nc} "
|
|
||||||
read -r -s -n 1
|
|
||||||
clear
|
clear
|
||||||
set_font
|
set_font
|
||||||
arch
|
arch
|
||||||
|
|||||||
Reference in New Issue
Block a user