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: Edit a few prompts for clarification/aesthetic purposes

Browse source 
Change: Make 'lightdm-gtk-greeter' the default option when selecting the 'Mate' and "Budgie' desktops
Variable renaming (better description)
This commit is contained in:
elementrick 2024-07-24 10:29:05 +00:00
parent f059095eaa
commit d119143434
1 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Amelia.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Amelia Installer # Amelia Installer
# Version: 6.7 # Version: 6.8
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
@ -107,7 +107,8 @@ invalid (){
sleep 0.3 sleep 0.3
RED " RED "
[!] Invalid response " [!] Invalid response
"
reload reload
} }
err_try (){ err_try (){
@ -200,9 +201,8 @@ stage_ok (){
} }
stage_fail (){ stage_fail (){
sleep 0.3 sleep 0.3
RED " line2
REDBG " ${yellow}[!] ${stage_prompt} configuration FAILED [!]"
[!] ${stage_prompt} configuration FAILED "
failure failure
} }
completion_err (){ completion_err (){
@ -249,15 +249,16 @@ arch (){
line3 line3
BLUEBG "************************************************************************************************* " BLUEBG "************************************************************************************************* "
BLUEBG " " BLUEBG " "
BLUEBG " ##### Arch Linux Installation ##### " BLUEBG " ##### Archlinux Installation ##### "
BLUEBG " " BLUEBG " "
BLUEBG "************************************************************************************************* " BLUEBG "************************************************************************************************* "
line2 line2
} }
cnfg (){ cnfg (){
sleep 0.3
line3 line3
YELLOWBG "------------------------------------------------------------------------------------------------- " YELLOWBG "------------------------------------------------------------------------------------------------- "
YELLOWBG " ### Configuring... ### " YELLOWBG " ### Configuring... ### "
YELLOWBG "------------------------------------------------------------------------------------------------- " YELLOWBG "------------------------------------------------------------------------------------------------- "
echo echo
sleep 0.3 sleep 0.3
@ -267,7 +268,7 @@ completion (){
line3 line3
GREENBG "************************************************************************************************* " GREENBG "************************************************************************************************* "
GREENBG " " GREENBG " "
GREENBG " ### Installation Completed ### " GREENBG " ### Installation Completed ### "
GREENBG " " GREENBG " "
GREENBG "************************************************************************************************* " GREENBG "************************************************************************************************* "
line3 line3
@ -277,7 +278,7 @@ failure (){
line3 line3
REDBG "************************************************************************************************* " REDBG "************************************************************************************************* "
REDBG " " REDBG " "
REDBG " ### Installation Failed ### " REDBG " ### Installation Aborted ### "
REDBG " " REDBG " "
REDBG "************************************************************************************************* " REDBG "************************************************************************************************* "
line3 line3
@ -2416,7 +2417,7 @@ ${magenta}###${nc}---------------------------------${magenta}[ ${bwhite}Automati
REDBG " [!] WARNING: All data on selected disk will be destroyed [!] " REDBG " [!] WARNING: All data on selected disk will be destroyed [!] "
REDBG " ------------------------------------------------------------ " REDBG " ------------------------------------------------------------ "
line2 line2
if [[ -e "${instl_drive}" && "${use_man}" != "yes" ]]; then if [[ -e "${instl_drive}" && "${use_manpreset}" != "yes" ]]; then
line2 line2
YELLOWBG " ------------------------------------------------------- " YELLOWBG " ------------------------------------------------------- "
YELLOWBG " > Apply 'Smart Partitioning' on disk '${instl_drive}'? [y/n] " YELLOWBG " > Apply 'Smart Partitioning' on disk '${instl_drive}'? [y/n] "
@ -2430,7 +2431,7 @@ ${magenta}###${nc}---------------------------------${magenta}[ ${bwhite}Automati
sgdsk_nmbr="${instl_dsk_nmbr}" sgdsk_nmbr="${instl_dsk_nmbr}"
elif [[ "${smartpart}" == "n" ]]; then elif [[ "${smartpart}" == "n" ]]; then
sgdsk_nmbr="${instl_dsk_nmbr}" sgdsk_nmbr="${instl_dsk_nmbr}"
use_man="yes" use_manpreset="yes"
until man_preset; do : ; done until man_preset; do : ; done
else else
invalid invalid
@ -2466,7 +2467,7 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
until dsks_submn; do : ; done until dsks_submn; do : ; done
fi fi
if [[ -z "${use_man}" ]] ; then if [[ -z "${use_manpreset}" ]] ; then
if [[ "${fs}" == "2" && "${swapmode}" == "1" ]]; then if [[ "${fs}" == "2" && "${swapmode}" == "1" ]]; then
preset="2" preset="2"
elif [[ "${fs}" == "2" && "${swapmode}" == "2" ]] || [[ "${fs}" == "2" && "${swapmode}" == "3" ]]; then elif [[ "${fs}" == "2" && "${swapmode}" == "2" ]] || [[ "${fs}" == "2" && "${swapmode}" == "3" ]]; then
@ -3132,7 +3133,7 @@ ${multi_swap}
sleep 0.3 sleep 0.3
NC " NC "
==> [${green}Disk ${sgdrive} Auto-Partitioned OK${nc}] " ==> [${green}Disk ${sgdrive} Smart-Partitioned OK${nc}] "
sleep 0.3 sleep 0.3
YELLOW " YELLOW "
@ -4589,7 +4590,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
5) # NOTE: Xfce Desktop: 5) # NOTE: Xfce Desktop:
deskpkgs="${basepkgs} xfce4 lightdm-slick-greeter network-manager-applet" deskpkgs="${basepkgs} xfce4 lightdm-gtk-greeter network-manager-applet"
displaymanager="lightdm" displaymanager="lightdm"
network="NetworkManager" ;; network="NetworkManager" ;;
@ -4620,7 +4621,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
10) # NOTE: Mate Desktop: 10) # NOTE: Mate Desktop:
deskpkgs="${basepkgs} mate mate-terminal mate-media blueman network-manager-applet mate-power-manager system-config-printer lightdm-slick-greeter" deskpkgs="${basepkgs} mate mate-terminal mate-media blueman network-manager-applet mate-power-manager system-config-printer lightdm-gtk-greeter"
displaymanager="lightdm" displaymanager="lightdm"
bluetooth="bluetooth" bluetooth="bluetooth"
network="NetworkManager" ;; network="NetworkManager" ;;
@ -4950,7 +4951,7 @@ DEEPIN
else else
stage_fail stage_fail
fi fi
elif [[ "${packages}" == "8" ]]; then elif [[ "${packages}" == "5" || "${packages}" == "8" || "${packages}" == "10" ]]; then
stage_prompt="GTK Greeter" stage_prompt="GTK Greeter"
if arch-chroot /mnt <<-GTK > /dev/null 2>&1 ; then if arch-chroot /mnt <<-GTK > /dev/null 2>&1 ; then
sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-gtk-greeter|g' /etc/lightdm/lightdm.conf || exit sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-gtk-greeter|g' /etc/lightdm/lightdm.conf || exit
@ -4959,7 +4960,7 @@ GTK
else else
stage_fail stage_fail
fi fi
else elif [[ "${packages}" == "6" ]]; then
stage_prompt="Slick Greeter" stage_prompt="Slick Greeter"
if arch-chroot /mnt <<-SLICK > /dev/null 2>&1 ; then if arch-chroot /mnt <<-SLICK > /dev/null 2>&1 ; then
sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-slick-greeter|g' /etc/lightdm/lightdm.conf || exit sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-slick-greeter|g' /etc/lightdm/lightdm.conf || exit
@ -5574,7 +5575,7 @@ NVIDIA_HOOK
swapprt="" swapprt=""
smartpart="" smartpart=""
partok="" partok=""
use_man="" use_manpreset=""
manpart="" manpart=""
instl_drive="" instl_drive=""
sgdsk_nmbr="" sgdsk_nmbr=""
@ -5589,6 +5590,7 @@ NVIDIA_HOOK
autopart="" autopart=""
prcnt="" prcnt=""
roottype="" roottype=""
stage_prompt=''
clear clear
first_check first_check