slococo
/
calsais
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add logAndExit() (refactor)

This commit is contained in:
Santiago Lo Coco 2022-01-02 16:09:10 -03:00
parent 82014eadff
commit 3eb42130c9
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
install.sh
View File

@ -18,9 +18,7 @@ logStep() {
checkUefi() { checkUefi() {
ls /sys/firmware/efi/efivars > /dev/null 2>&1 ls /sys/firmware/efi/efivars > /dev/null 2>&1
if [ $? -ge 1 ]; then if [ $? -ge 1 ]; then
whiptail --msgbox "This scripts supports only UEFI boot mode." 0 0 logAndExit "This scripts supports only UEFI boot mode." "checkUefi"
logStep "checkUefi"
exit 1
fi fi
} }
@ -28,8 +26,7 @@ updateSystemClock() {
timedatectl set-ntp true timedatectl set-ntp true
} }
exitIfCancel() { logAndExit() {
if [ $? -eq 1 ]; then
str="${1} Therefore, the installation process will stop, but you can continue where you left off by running:\n\nsh CocoASAIS" str="${1} Therefore, the installation process will stop, but you can continue where you left off by running:\n\nsh CocoASAIS"
newlines=$(printf "$str" | grep -c $'\n') newlines=$(printf "$str" | grep -c $'\n')
chars=$(echo "$str" | wc -c) chars=$(echo "$str" | wc -c)
@ -40,6 +37,11 @@ exitIfCancel() {
whiptail --msgbox "$str" $((5+height)) 60 whiptail --msgbox "$str" $((5+height)) 60
echo "${2}" > CocoASAIS.log echo "${2}" > CocoASAIS.log
exit 1 exit 1
}
exitIfCancel() {
if [ $? -eq 1 ]; then
logAndExit "$@"
fi fi
} }
@ -59,11 +61,8 @@ partDisks() {
calcHeightAndRun "whiptail --msgbox \"You will partition the disk yourself with gdisk and then, when finished, you will continue with the installation.\" HEIGHT 62 3>&1 1>&2 2>&3" calcHeightAndRun "whiptail --msgbox \"You will partition the disk yourself with gdisk and then, when finished, you will continue with the installation.\" HEIGHT 62 3>&1 1>&2 2>&3"
gdisk $disk gdisk $disk
parts=$(lsblk $disk -nl | wc -l) parts=$(lsblk $disk -nl | wc -l)
if [ $parts -eq 1 ]; then [ $parts -eq 1 ] && logAndExit "You must at least create boot and root partitions." "partDisks"
whiptail --msgbox "You must at least create boot and root partitions." 0 0
logStep "partDisks"
exit 1
fi
# TODO: Ask for home partition # TODO: Ask for home partition
formatOptions $(lsblk ${disk} -pnlo NAME,SIZE,MOUNTPOINTS | sed -n '2~1p') formatOptions $(lsblk ${disk} -pnlo NAME,SIZE,MOUNTPOINTS | sed -n '2~1p')
result=$(whiptail --title "Select the boot partition." --menu "" 0 0 0 "${options[@]}" 3>&1 1>&2 2>&3) result=$(whiptail --title "Select the boot partition." --menu "" 0 0 0 "${options[@]}" 3>&1 1>&2 2>&3)
@ -140,9 +139,7 @@ installPackage() {
runInChroot "sudo -u $username paru -S --needed --noconfirm --skipreview ${1}" 2>&1 | debug runInChroot "sudo -u $username paru -S --needed --noconfirm --skipreview ${1}" 2>&1 | debug
;; ;;
?) ?)
whiptail --msgbox "INSTALL must be A, B or C in packages.csv file." 0 0 logAndExit "INSTALL must be A, B or C in packages.csv file." "${3}"
logStep "${3}"
exit 1
;; ;;
esac esac
exitIfCancel "Package installation failed." "${3}" exitIfCancel "Package installation failed." "${3}"