| Hash | Commit message | Author | Date | Files | + | - |
|---|
| 1 | commit 3635405e47d729ad81843aa1fa59348c9ae9f266 |
| 2 | Author: Connor Etherington <[email protected]> |
| 3 | Date: Thu Mar 31 12:05:26 2022 +0200 |
| 4 | |
| 5 | Update. |
| 6 | --- |
| 7 | autoCleanInstall | 21 ++++++++++----------- |
| 8 | 1 file changed, 10 insertions(+), 11 deletions(-) |
| 9 | |
| 10 | diff --git a/autoCleanInstall b/autoCleanInstall |
| 11 | index cb8f216..5a9477e 100755 |
| 12 | --- a/autoCleanInstall |
| 13 | +++ b/autoCleanInstall |
| 14 | @@ -1,4 +1,4 @@ |
| 15 | -#!/usr/bin/env sh |
| 16 | +#!/usr/bin/env bash |
| 17 | ######################################################################################################################################################################################### |
| 18 | ## A U T O L I N U X B O O T S T R A P S C R I P T ## |
| 19 | ######################################################################################################################################################################################### |
| 20 | @@ -188,8 +188,7 @@ wholeDisk || err "User Exited." |
| 21 | |
| 22 | case "$(cat $wholeDisk)" in |
| 23 | 1) getDisk && begin ;; |
| 24 | - 0) selectParts && definedConfirm && definedPartitioning ; wipeType='manual' |
| 25 | - mount $(cat $selRootFS) /mnt && completion && sleep 5 || err "User Exited.";; |
| 26 | + 0) selectParts && definedConfirm && definedPartitioning && wipeType='manual' && completion && sleep 5 ;;[41m |
| 27 | 3) confirm && case "$(echo $WIPE)" in |
| 28 | '0') begin ;; |
| 29 | '1') wipeDisk && completion ; sleep 4 && wipeType='automatic'; mount $(cat $selDsk)4 /mnt |
| 30 | @@ -198,20 +197,20 @@ esac ; } |
| 31 | |
| 32 | base_install(){ \ |
| 33 | for x in linux-firmware base base-devel; do |
| 34 | - dialog --colors --title " ~ AutoLinux ~ " --infobox "Installing $x, the fundaemental system packages..." 3 60 ; |
| 35 | + dialog --colors --title " ~ AutoLinux ~ " --infobox "Installing $x, part of the fundaemental system packages..." 3 80 ; |
| 36 | pacstrap /mnt $x --needed --noconfirm >/dev/null 2>&1 && |
| 37 | pacConf /mnt/etc/pacman.conf >/dev/null 2>&1 ; done ; } |
| 38 | |
| 39 | post_install(){ \ |
| 40 | - for x in git curl zsh wget efibootmgr dosfstools mtools pacman-contrib fzf terminus-font os-prober bash-completion; do |
| 41 | - dialog --colors --title " ~ AutoLinux ~ " --infobox "Installing $x, needed for the installation..." 3 60 ; |
| 42 | + for x in efibootmgr dosfstools mtools pacman-contrib os-prober; do |
| 43 | + dialog --colors --title " ~ AutoLinux ~ " --infobox "Installing $x, needed for the installation..." 3 80 ; |
| 44 | pacstrap /mnt $x --needed --noconfirm >/dev/null 2>&1 ; clear ; done ; } |
| 45 | |
| 46 | cp_scripts(){ cd $srcdir && cp autoInstall /mnt/usr/bin >/dev/null 2>&1 ; } |
| 47 | |
| 48 | success(){ \ |
| 49 | figlet -toc 'Success!'|lolcat ; echo -e "\n" ; sleep 2 && |
| 50 | -arch-chroot /mnt /usr/bin/autoInstall |
| 51 | +arch-chroot /mnt bash /usr/bin/autoInstall |
| 52 | } |
| 53 | |
| 54 | |
| 55 | @@ -230,10 +229,10 @@ post_install || err "User Exited." |
| 56 | |
| 57 | ! [ -d /mnt/boot/EFI ] && mkdir -p /mnt/boot/EFI |
| 58 | |
| 59 | -case $wipeType in |
| 60 | - 'manual') mount $(cat $selBoot) /mnt/boot ;; |
| 61 | - 'automatic') mount $(cat $selDsk)2 /mnt/boot/ ;; |
| 62 | - *) err "User Exited." ;; esac |
| 63 | +case "$wipeType" in |
| 64 | + 'manual') sudo mount $(cat $selBoot) /mnt/boot/EFI ;; |
| 65 | + 'automatic') sudo mount $(cat $selDsk)2 /mnt/boot/EFI ;; |
| 66 | +esac |
| 67 | |
| 68 | cp_scripts ; success && exit 0 || fail && exit 1 |
| 69 | |