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

Change: 'Start Installation' > If all required partitions are already present on disk and you reject using them, you will be presented with the following options (in this order): 'Smart Partitioning' > 'Partitioning Presets' > 'Manual Partitioning'. If you reject all of the above options, the installer will abort.

Browse source 
Prompts renaming/spacing for clarification/aesthetic reasons
Added 'sox' package at the KDE/Plasma Custom setup & Gnome Custom Setup
This commit is contained in:
elementrick 2024-07-19 16:19:45 +00:00
parent 8041a1bea9
commit 8c502a7ca0
1 changed files with 42 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

69
Amelia.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Amelia Installer # Amelia Installer
# Version: 6.5 # Version: 6.6
set -euo pipefail set -euo pipefail
trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR
@ -180,6 +180,7 @@ umount_manual (){
choice (){ choice (){
sleep 0.3 sleep 0.3
RED " RED "
[!] Please make a choice to continue " [!] Please make a choice to continue "
reload reload
} }
@ -209,7 +210,7 @@ completion_err (){
[!] Please complete '${stage_prompt}' to continue [!] Please complete${nc} '${stage_prompt}' ${cyan}to continue
" "
} }
intel (){ intel (){
@ -326,6 +327,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Font
Enter a number: " Enter a number: "
read -r -p " read -r -p "
==> " fontselect ==> " fontselect
echo
if [[ "${fontselect}" == "1" ]]; then if [[ "${fontselect}" == "1" ]]; then
setfont ter-v18b setfont ter-v18b
@ -374,7 +376,11 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Internet
else else
RED " RED "
[!] An active internet connection is mandatory to continue "
[!] An active internet connection is mandatory to continue
"
failure failure
fi fi
} }
@ -434,9 +440,10 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}M
> Make a selection: " > Make a selection: "
CYAN " CYAN "
--------------------------------------------------------------------------
### Select ${nc}[4] ${cyan}for ${nc}'Guided Navigation'${cyan} and ${nc}'Smart Auto-Partitioning'${cyan} ### ---------------------------------------------------------------------
--------------------------------------------------------------------------" ### Select ${nc}[4] ${cyan}for ${nc}'Guided Navigation'${cyan} and ${nc}'Smart Partitioning'${cyan} ###
---------------------------------------------------------------------"
NC " NC "
[1] Personalization [1] Personalization
@ -452,6 +459,7 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}M
Enter a number: " Enter a number: "
read -r -p " read -r -p "
==> " menu ==> " menu
echo
case "${menu}" in case "${menu}" in
1) 1)
@ -1016,7 +1024,8 @@ Enter [y/n]: "
sleep 0.3 sleep 0.3
YELLOW " YELLOW "
### ${fsname} has been selected " ;; ### ${fsname} has been selected
" ;;
2) 2)
fsname="Btrfs" fsname="Btrfs"
fs_mod="btrfs" fs_mod="btrfs"
@ -2242,6 +2251,7 @@ ${disks}"
Enter a disk number ${bwhite}(empty to skip)${blue}: " Enter a disk number ${bwhite}(empty to skip)${blue}: "
read -r -p " read -r -p "
==> " gpt_dsk_nmbr ==> " gpt_dsk_nmbr
echo
if [[ -n "${gpt_dsk_nmbr}" ]]; then if [[ -n "${gpt_dsk_nmbr}" ]]; then
gptdrive="$(echo "${disks}" | awk "\$1 == ${gpt_dsk_nmbr} { print \$2}")" gptdrive="$(echo "${disks}" | awk "\$1 == ${gpt_dsk_nmbr} { print \$2}")"
@ -2373,11 +2383,12 @@ ${magenta}###${nc}---------------------------------${magenta}[ ${bwhite}Automati
if [[ -e "${instl_drive}" && "${use_man}" != "yes" ]]; then if [[ -e "${instl_drive}" && "${use_man}" != "yes" ]]; then
BLUE " BLUE "
> Use ${nc}${cyan}Smart ${blue}Auto-Partitioning on disk${nc} ${cyan}'${instl_drive}'${blue} ? [y/n] > Use ${nc}${cyan}'Smart Partitioning' ${blue}on disk ${nc}'${instl_drive}'${blue} ? [y/n]
" "
read -r -p " read -r -p "
==> " smartpart ==> " smartpart
echo
if [[ "${smartpart}" == "y" ]]; then if [[ "${smartpart}" == "y" ]]; then
sgdsk_nmbr="${instl_dsk_nmbr}" sgdsk_nmbr="${instl_dsk_nmbr}"
@ -2610,6 +2621,7 @@ Enter a Custom Percentage number ${nc}${cyan}(e.g. 30) ${bwhite}(empty to skip)$
manual_part (){ manual_part (){
local prompt="Disks" local prompt="Disks"
stage_prompt="Partitioning"
manpart="yes" manpart="yes"
sleep 0.3 sleep 0.3
NC " NC "
@ -2677,9 +2689,11 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
fi fi
else else
skip skip
ok
if [[ -z "${sanity}" ]]; then if [[ "${partok}" == "n" ]]; then
line2
stage_fail
elif [[ -z "${sanity}" ]]; then
until dsks_submn; do : ; done until dsks_submn; do : ; done
elif [[ "${sanity}" == "no" ]]; then elif [[ "${sanity}" == "no" ]]; then
until instl_dsk; do : ; done until instl_dsk; do : ; done
@ -3283,7 +3297,7 @@ instl (){
CYAN " CYAN "
[!] Please complete 'Locale & Keyboard Layout Selection' to continue [!] Please complete ${nc}'Locale & Keyboard Layout Selection'${cyan} to continue
" "
until slct_locale; do : ; done until slct_locale; do : ; done
until slct_kbd; do : ; done until slct_kbd; do : ; done
@ -3597,14 +3611,14 @@ form_efi (){
NC " NC "
${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Format Boot Partition${nc} ${magenta}]${nc}----------------------------------${magenta}###${nc} ${magenta}###${nc}-------------------------------${magenta}[ ${bwhite}Format EFI System Partition${nc} ${magenta}]${nc}-------------------------------${magenta}###${nc}
" "
form_boot_nmbr=" " form_boot_nmbr=" "
while [[ -n "${form_boot_nmbr}" ]]; do while [[ -n "${form_boot_nmbr}" ]]; do
YELLOW " YELLOW "
> Select a partition to format as ESP [/Boot] " > Select an EFI System Partition to format as vfat "
NC " NC "
${volumes}" ${volumes}"
@ -3622,7 +3636,7 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: "
sleep 0.3 sleep 0.3
NC " NC "
==> [${green}Format & Label /Boot OK${nc}] " ==> [${green}Format & Label /ESP OK${nc}] "
return 0 return 0
else else
umount_abort umount_abort
@ -3657,7 +3671,7 @@ ${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Format
while [[ -n "${form_root_nmbr}" ]]; do while [[ -n "${form_root_nmbr}" ]]; do
YELLOW " YELLOW "
> Select a partition to format as ${fsname} [${roottype}] " > Select a ${roottype} Partition to format as ${fsname} "
NC " NC "
${volumes}" ${volumes}"
@ -3718,7 +3732,7 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: "
YELLOW " YELLOW "
> Label the ${roottype} partition " > Label the ${roottype} Partition "
BLUE " BLUE "
@ -3770,7 +3784,7 @@ ask_homepart_form (){
> A${nc} ${cyan}/Home ${blue}partition has been detected. Format as${nc} ${cyan}${fsname}${blue}? [y/n] > A${nc} ${cyan}/Home ${blue}Partition has been detected. Format as${nc} ${cyan}${fsname}${blue}? [y/n]
" "
@ -3818,7 +3832,7 @@ ${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Format
while [[ -n "${form_home_nmbr}" ]]; do while [[ -n "${form_home_nmbr}" ]]; do
YELLOW " YELLOW "
> Select a partition to format as Ext4 [/Home] " > Select a /Home Partition to format as Ext4 "
NC " NC "
@ -3851,7 +3865,7 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: "
fi fi
YELLOW " YELLOW "
> Label the /Home partition " > Label the /Home Partition "
BLUE " BLUE "
@ -3887,11 +3901,11 @@ mount_mnt (){
NC " NC "
${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Mount Root Partition${nc} ${magenta}]${nc}----------------------------------${magenta}###${nc} ${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Mount Root Partition${nc} ${magenta}]${nc}----------------------------------${magenta}###${nc}
" "
YELLOW " YELLOW "
> Select a partition to mount to ${nc}/mnt " > Select a ${roottype} Partition to mount to ${nc}/mnt "
NC " NC "
@ -3954,11 +3968,11 @@ mount_boot (){
NC " NC "
${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Mount Boot Partition${nc} ${magenta}]${nc}----------------------------------${magenta}###${nc} ${magenta}###${nc}-----------------------------------${magenta}[ ${bwhite}Mount ESP Partition${nc} ${magenta}]${nc}-----------------------------------${magenta}###${nc}
" "
YELLOW " YELLOW "
> Select a partition to mount to ${nc}/mnt/boot " > Select an EFI System Partition to mount to ${nc}/mnt/boot "
NC " NC "
@ -3966,7 +3980,7 @@ ${volumes}"
BLUE " BLUE "
Enter your${nc} ${cyan}/Boot ${blue}partition number: " Enter your${nc} ${cyan}/ESP ${blue}partition number: "
read -r -p " read -r -p "
==> " mntboot_nmbr ==> " mntboot_nmbr
echo echo
@ -3999,11 +4013,11 @@ mount_home (){
NC " NC "
${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Mount Home Partition${nc} ${magenta}]${nc}----------------------------------${magenta}###${nc} ${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Mount Home Partition${nc} ${magenta}]${nc}----------------------------------${magenta}###${nc}
" "
YELLOW " YELLOW "
> Select a partition to mount to ${nc}/mnt/home " > Select a /Home Partition to mount to ${nc}/mnt/home "
NC " NC "
@ -4478,7 +4492,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
4) # NOTE: Custom Gnome & Systemd-boot & Optimized System: 4) # NOTE: Custom Gnome & Systemd-boot & Optimized System:
deskpkgs="${basepkgs} evince file-roller gdm gnome-calculator gnome-clocks gnome-console gnome-control-center gnome-disk-utility gnome-keyring gnome-menus gnome-session gnome-shell-extensions gnome-shell-extension-appindicator gnome-system-monitor gnome-text-editor gnome-tweaks gvfs gvfs-afc gvfs-mtp loupe malcontent nautilus networkmanager power-profiles-daemon simple-scan sushi system-config-printer xdg-desktop-portal-gnome xdg-user-dirs-gtk alsa-firmware alsa-utils ccache cups-pdf e2fsprogs efibootmgr exfatprogs fdkaac git glib2-devel glibc-locales gnome-browser-connector gparted gst-libav gst-plugin-libcamera gst-plugin-msdk gst-plugin-opencv gst-plugin-pipewire gst-plugin-qmlgl gst-plugin-va gst-plugin-wpe gst-plugins-ugly gstreamer-vaapi htop icoutils ipp-usb irqbalance libfido2 libva-utils lrzip mac man-db man-pages meld mesa-utils mold nano-syntax-highlighting nss-mdns ntfs-3g p7zip pacman-contrib pbzip2 pdfmixtool pigz pipewire-alsa pipewire-pulse powerline powerline-fonts qbittorrent realtime-privileges reflector rng-tools sof-firmware terminus-font ttf-ubuntu-font-family unrar unzip usb_modeswitch usbutils vdpauinfo vlc wget zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting ${nrg_plc}" ;; deskpkgs="${basepkgs} evince file-roller gdm gnome-calculator gnome-clocks gnome-console gnome-control-center gnome-disk-utility gnome-keyring gnome-menus gnome-session gnome-shell-extensions gnome-shell-extension-appindicator gnome-system-monitor gnome-text-editor gnome-tweaks gvfs gvfs-afc gvfs-mtp loupe malcontent nautilus networkmanager power-profiles-daemon simple-scan sushi system-config-printer xdg-desktop-portal-gnome xdg-user-dirs-gtk alsa-firmware alsa-utils ccache cups-pdf e2fsprogs efibootmgr exfatprogs fdkaac git glib2-devel glibc-locales gnome-browser-connector gparted gst-libav gst-plugin-libcamera gst-plugin-msdk gst-plugin-opencv gst-plugin-pipewire gst-plugin-qmlgl gst-plugin-va gst-plugin-wpe gst-plugins-ugly gstreamer-vaapi htop icoutils ipp-usb irqbalance libfido2 libva-utils lrzip mac man-db man-pages meld mesa-utils mold nano-syntax-highlighting nss-mdns ntfs-3g p7zip pacman-contrib pbzip2 pdfmixtool pigz pipewire-alsa pipewire-pulse powerline powerline-fonts qbittorrent realtime-privileges reflector rng-tools sof-firmware sox terminus-font ttf-ubuntu-font-family unrar unzip usb_modeswitch usbutils vdpauinfo vlc wget zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting ${nrg_plc}" ;;
5) # NOTE: Xfce Desktop: 5) # NOTE: Xfce Desktop:
@ -5481,6 +5495,7 @@ NVIDIA_HOOK
sep_home="" sep_home=""
autopart="" autopart=""
prcnt="" prcnt=""
roottype=""
clear clear
first_check first_check