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: Now the installer specifically informs the user if the installation disk has been Auto-Formatted by the 'Smart Partitioning' or 'Partitioning Presets' function

Browse source 
Change: Running 'pacstrap' now ommits the '-i' flag, to speed up the whole process
Change: 'Automatic Partitioning' stage has been revised to ommit an unnecessary repeat of the 'Sanity Check' stage
Change: Now, when the Installer aborts, it automatically unmounts all/any mounted partitions, for convenience
Remove: 'vorbisgain' package has been removed from the 'Minimal Plasma' setup, in compliance with Arch's repos
Change: 'LDFLAGS' & 'RUSTFLAGS' configuration has been removed from the 'makepkgd.conf' drop-in configuration file at /etc/makepkg.conf.d/
Change: A few Prompts have been edited, to provide better aesthetics
Change: Some minor indentation
This commit is contained in:
elementrick 2024-09-20 20:07:35 +00:00
parent 8d2217a137
commit 9f192bb1b5
1 changed files with 46 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

60
Amelia.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Amelia Installer # Amelia Installer
# Version: 7.4 # Version: 7.5
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
@ -311,9 +311,13 @@ cnfg() {
sleep 0.2 sleep 0.2
line3 line3
MAGENTABG "------------------------------------------------------------------------------------------------- " MAGENTABG "------------------------------------------------------------------------------------------------- "
MAGENTABG " ### Configuring... ### " MAGENTABG " ### Configuring ### "
MAGENTABG "------------------------------------------------------------------------------------------------- " MAGENTABG "------------------------------------------------------------------------------------------------- "
echo line2
YELLOWL "
... Please Wait ...
"
sleep 0.2 sleep 0.2
} }
completion() { completion() {
@ -335,6 +339,7 @@ failure() {
REDBG " " REDBG " "
REDBG "************************************************************************************************* " REDBG "************************************************************************************************* "
line3 line3
umount -R /mnt
exit exit
} }
# END PROMPT FUNCTIONS # END PROMPT FUNCTIONS
@ -495,9 +500,9 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}M
YELLOW " YELLOW "
> Make a selection: " > Make a selection: "
CYAN " YELLOWL "
*** ${nc}Select ${bwhite}[4] ${nc}to utilize ${yellowl}'Guided Navigation' ${nc}& ${yellowl}'Smart Partitioning' ${nc}functions ${cyan}*** >>> ${nc}Select ${bwhite}[4] ${nc}to utilize ${yellowl}Guided Navigation ${nc}& ${yellowl}Smart Partitioning ${nc}functions
" "
NC " NC "
@ -2607,11 +2612,17 @@ Enter a Preset number ${bwhite}(empty to skip)${blue}: "
read -r -p " read -r -p "
==> " preset ==> " preset
echo echo
if [[ "${preset}" =~ ^(1|2|3|4)$ ]]; then
presetpart="y"
fi
} }
################################################################################################### ###################################################################################################
auto_part() { auto_part() {
slct_autoprt="yes" slct_autoprt="yes"
smartpart=""
presetpart=""
local prompt="Disk Partitions" local prompt="Disk Partitions"
local stage_prompt="Auto-Partitioning" local stage_prompt="Auto-Partitioning"
sleep 0.2 sleep 0.2
@ -2628,10 +2639,10 @@ ${magenta}###${nc}---------------------------------${magenta}[ ${bwhite}Automati
line2 line2
if [[ -e "${instl_drive}" && "${use_manpreset}" != "yes" ]]; then if [[ -e "${instl_drive}" && "${use_manpreset}" != "yes" ]]; then
sleep 0.2 sleep 0.2
RED " NC "
------------------------------------------------------------------------- -----------------------------------------------------------------
### >>> ${yellow}Apply ${nc}'Smart Partitioning' ${yellow}on disk ${nc}'${instl_drive}'${yellow} ? [y/n] ${red}<<< ### ${yellowl}>>> ${nc}Apply ${bwhite}'Smart Partitioning' ${nc}on disk ${bwhite}'${instl_drive}'${nc} ? [y/n] ${yellowl}<<<${nc}
------------------------------------------------------------------------- -----------------------------------------------------------------
" "
read -r -p " read -r -p "
==> " smartpart ==> " smartpart
@ -2778,7 +2789,6 @@ Enter a Custom Percentage number ${nc}e.g. 30 ${bwhite}(empty to skip)${blue}: "
partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail
fi fi
if [[ "${install}" == "yes" ]]; then if [[ "${install}" == "yes" ]]; then
autopart="yes"
until sanity_check; do : ; done until sanity_check; do : ; done
else else
ok ok
@ -2801,7 +2811,6 @@ Enter a Custom Percentage number ${nc}e.g. 30 ${bwhite}(empty to skip)${blue}: "
partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail
fi fi
if [[ "${install}" == "yes" ]]; then if [[ "${install}" == "yes" ]]; then
autopart="yes"
until sanity_check; do : ; done until sanity_check; do : ; done
else else
ok ok
@ -2822,7 +2831,6 @@ Enter a Custom Percentage number ${nc}e.g. 30 ${bwhite}(empty to skip)${blue}: "
partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail
fi fi
if [[ "${install}" == "yes" ]]; then if [[ "${install}" == "yes" ]]; then
autopart="yes"
until sanity_check; do : ; done until sanity_check; do : ; done
else else
ok ok
@ -2847,7 +2855,6 @@ Enter a Custom Percentage number ${nc}e.g. 30 ${bwhite}(empty to skip)${blue}: "
partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail
fi fi
if [[ "${install}" == "yes" ]]; then if [[ "${install}" == "yes" ]]; then
autopart="yes"
until sanity_check; do : ; done until sanity_check; do : ; done
else else
ok ok
@ -3494,11 +3501,16 @@ ${multi_swap}
fi fi
#-------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------
if [[ "${sanity}" == "ok" ]]; then if [[ "${sanity}" == "ok" ]]; then
if [[ "${autopart}" == "yes" ]]; then if [[ "${smartpart}" == "y" ]]; then
sleep 0.2 sleep 0.2
NC " NC "
==> [${green}Disk ${sgdrive} Smart-Partitioned OK${nc}] " ==> [${green}Disk ${sgdrive} Smart-Partitioned OK${nc}] "
elif [[ "${presetpart}" == "y" ]]; then
sleep 0.2
NC "
==> [${green}Disk ${sgdrive} Preset-Partitioned OK${nc}] "
fi fi
sleep 0.2 sleep 0.2
NC " NC "
@ -3528,6 +3540,7 @@ ${multi_swap}
local prompt="Confirm Disk" local prompt="Confirm Disk"
local stage_prompt="Partitioning" local stage_prompt="Partitioning"
if [[ "${partok}" == "y" ]]; then if [[ "${partok}" == "y" ]]; then
ok ok
return 0 return 0
@ -3540,10 +3553,8 @@ ${multi_swap}
process process
if [[ "${slct_autoprt}" != "yes" ]]; then if [[ "${slct_autoprt}" != "yes" ]]; then
until auto_part; do : ; done until auto_part; do : ; done
return 1
else else
until manual_part; do : ; done until manual_part; do : ; done
return 1
fi fi
fi fi
elif [[ "${multibooting}" == "y" ]]; then elif [[ "${multibooting}" == "y" ]]; then
@ -5201,7 +5212,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
network="NetworkManager" ;; network="NetworkManager" ;;
2) # Minimal Plasma & Apps & System optimizations: 2) # Minimal Plasma & Apps & System optimizations:
deskpkgs="${basepkgs} alsa-firmware alsa-utils arj ark bluedevil breeze-gtk ccache cups-pdf cups-pk-helper dolphin-plugins e2fsprogs efibootmgr exfatprogs fdkaac ffmpegthumbs firefox git glibc-locales 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 kamera kamoso kate kcalc kde-gtk-config kdegraphics-mobipocket kdegraphics-thumbnailers kdenetwork-filesharing kdeplasma-addons kdesdk-kio kdesdk-thumbnailers kdialog keditbookmarks kget kimageformats kinit kio-admin kio-gdrive kio-zeroconf kompare konsole kscreen kvantum kwrited libappimage libfido2 libktorrent libmms libnfs libva-utils lirc lrzip lua52-socket lzop mac man-db man-pages mesa-demos mesa-utils mold nano-syntax-highlighting nss-mdns ntfs-3g okular opus-tools p7zip packagekit-qt6 pacman-contrib partitionmanager pbzip2 pdfmixtool pigz pipewire-alsa pipewire-pulse plasma-browser-integration plasma-desktop plasma-disks plasma-firewall plasma-nm plasma-pa plasma-wayland-protocols power-profiles-daemon powerdevil powerline powerline-fonts print-manager python-pyqt6 python-reportlab qbittorrent qt6-imageformats qt6-scxml qt6-virtualkeyboard realtime-privileges reflector rng-tools sddm-kcm skanlite sof-firmware sox spectacle sshfs system-config-printer terminus-font timidity++ ttf-ubuntu-font-family unarchiver unrar unzip usb_modeswitch usbutils vdpauinfo vlc vorbis-tools vorbisgain wget xdg-desktop-portal xdg-desktop-portal-gtk xdg-desktop-portal-kde zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting ${nrg_plc}" ;; deskpkgs="${basepkgs} alsa-firmware alsa-utils arj ark bluedevil breeze-gtk ccache cups-pdf cups-pk-helper dolphin-plugins e2fsprogs efibootmgr exfatprogs fdkaac ffmpegthumbs firefox git glibc-locales 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 kamera kamoso kate kcalc kde-gtk-config kdegraphics-mobipocket kdegraphics-thumbnailers kdenetwork-filesharing kdeplasma-addons kdesdk-kio kdesdk-thumbnailers kdialog keditbookmarks kget kimageformats kinit kio-admin kio-gdrive kio-zeroconf kompare konsole kscreen kvantum kwrited libappimage libfido2 libktorrent libmms libnfs libva-utils lirc lrzip lua52-socket lzop mac man-db man-pages mesa-demos mesa-utils mold nano-syntax-highlighting nss-mdns ntfs-3g okular opus-tools p7zip packagekit-qt6 pacman-contrib partitionmanager pbzip2 pdfmixtool pigz pipewire-alsa pipewire-jack pipewire-pulse plasma-browser-integration plasma-desktop plasma-disks plasma-firewall plasma-nm plasma-pa plasma-wayland-protocols power-profiles-daemon powerdevil powerline powerline-fonts print-manager python-pyqt6 python-reportlab qbittorrent qt6-imageformats qt6-scxml qt6-virtualkeyboard realtime-privileges reflector rng-tools sddm-kcm skanlite sof-firmware sox spectacle sshfs system-config-printer terminus-font timidity++ ttf-ubuntu-font-family unarchiver unrar unzip usb_modeswitch usbutils vdpauinfo vlc vorbis-tools wget xdg-desktop-portal xdg-desktop-portal-gtk xdg-desktop-portal-kde zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting ${nrg_plc}" ;;
3) # Gnome Desktop: 3) # Gnome Desktop:
deskpkgs="${basepkgs} gnome networkmanager" deskpkgs="${basepkgs} gnome networkmanager"
@ -5210,7 +5221,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
network="NetworkManager" ;; network="NetworkManager" ;;
4) # Minimal Gnome & Apps & System optimizations: 4) # Minimal Gnome & Apps & System optimizations:
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 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}" ;; 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 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-jack 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) # Xfce Desktop: 5) # Xfce Desktop:
deskpkgs="${basepkgs} xfce4 lightdm-gtk-greeter network-manager-applet" deskpkgs="${basepkgs} xfce4 lightdm-gtk-greeter network-manager-applet"
@ -5256,7 +5267,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
fi ;; fi ;;
esac esac
if pacstrap -K -i /mnt ${deskpkgs} ; then if pacstrap -K /mnt ${deskpkgs} ; then
if [[ "${fs}" == "2" ]]; then if [[ "${fs}" == "2" ]]; then
genfstab -t PARTUUID /mnt >> /mnt/etc/fstab || err_abort genfstab -t PARTUUID /mnt >> /mnt/etc/fstab || err_abort
sleep 0.2 sleep 0.2
@ -6026,10 +6037,11 @@ NRG
MKINITCPIO_CONF MKINITCPIO_CONF
mkinitcpio -P || exit mkinitcpio -P || exit
cat <<-MAKEPKG_CONF > /etc/makepkg.conf.d/makepkgd.conf || exit cat <<-MAKEPKG_CONF > /etc/makepkg.conf.d/makepkgd.conf || exit
CFLAGS="-march=native -O2 -pipe -fno-plt -fexceptions -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security -fstack-clash-protection -fcf-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" CFLAGS="-march=native -O2 -pipe -fno-plt -fexceptions \
LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now -Wl,-z,pack-relative-relocs,-fuse-ld=mold" -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \
RUSTFLAGS="-C force-frame-pointers=yes -C opt-level=3 -C target-cpu=native -C link-arg=-fuse-ld=mold" -fstack-clash-protection -fcf-protection \
MAKEFLAGS="-j$(nproc)" -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"
MAKEFLAGS="-j4"
BUILDENV=(!distcc color ccache check !sign) BUILDENV=(!distcc color ccache check !sign)
OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto) OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)
COMPRESSGZ=(pigz -c -f -n) COMPRESSGZ=(pigz -c -f -n)
@ -6230,7 +6242,7 @@ OPTIMIZED_CONF
sgdrive="" sgdrive=""
cgdrive="" cgdrive=""
sep_home="" sep_home=""
autopart="" presetpart=""
prcnt="" prcnt=""
roottype="" roottype=""
stage_prompt="" stage_prompt=""