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

Add tryLoadVar() and leave CocoASAIS.log strictly for logging purposes

This commit is contained in:
Santiago Lo Coco 2022-01-05 23:26:52 -03:00
parent 4345501999
commit dfcfa7ef3a
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
install.sh
View File

@ -32,7 +32,7 @@ logAndExit() {
printf "%d", (x == int(x)) ? x : int(x) + 1 printf "%d", (x == int(x)) ? x : int(x) + 1
}') }')
whiptail --msgbox "$str" $((5+height)) 60 3>&1 1>&2 2>&3 whiptail --msgbox "$str" $((5+height)) 60 3>&1 1>&2 2>&3
echo ${2} > CocoASAIS.log saveVar "lastStep" "${2}"
exit 1 exit 1
} }
@ -397,7 +397,7 @@ updateMirrors() {
grubSetUp() { grubSetUp() {
printWaitBox printWaitBox
[ -z $bootPath ] && loadVar "bootPath" [ -z $bootPath ] && tryLoadVar "bootPath"
runInChroot "grub-install --target=x86_64-efi --efi-directory=${bootPath} --bootloader-id=GRUB; grub-mkconfig -o /boot/grub/grub.cfg" 2>&1 | debug runInChroot "grub-install --target=x86_64-efi --efi-directory=${bootPath} --bootloader-id=GRUB; grub-mkconfig -o /boot/grub/grub.cfg" 2>&1 | debug
} }
@ -412,12 +412,16 @@ saveVar() {
loadVar() { loadVar() {
var=$(grep "$1=" CocoASAIS.vars | cut -d= -f2) var=$(grep "$1=" CocoASAIS.vars | cut -d= -f2)
if [ -z $var ]; then export $1=$var
}
tryLoadVar() {
loadVar $1
if [ -z ${!1} ]; then
echo "Couldn't load '$1'. Try to run the script again." 1>&2 echo "Couldn't load '$1'. Try to run the script again." 1>&2
rm -f CocoASAIS.log CocoASAIS.vars rm -f CocoASAIS.vars
exit 1 exit 1
fi fi
export $1=$var
} }
userSetUp() { userSetUp() {
@ -439,7 +443,7 @@ EOF
installOtherPackages() { installOtherPackages() {
calcHeightAndRun "whiptail --msgbox \"Now, we will install a few more packages (in the background). Press OK and wait (it may take some time).\" HEIGHT 60 3>&1 1>&2 2>&3" calcHeightAndRun "whiptail --msgbox \"Now, we will install a few more packages (in the background). Press OK and wait (it may take some time).\" HEIGHT 60 3>&1 1>&2 2>&3"
[ -z $username ] && loadVar "username" [ -z $username ] && tryLoadVar "username"
getThePackages "S" "installOtherPackages" getThePackages "S" "installOtherPackages"
checkForParu checkForParu
getThePackages "N" "installOtherPackages" getThePackages "N" "installOtherPackages"
@ -537,8 +541,8 @@ runScript() {
fi fi
i=0; found=false i=0; found=false
if [ -f "CocoASAIS.log" ]; then loadVar "lastStep"
lastStep=$(cat CocoASAIS.log) if [ -n "$lastStep" ]; then
for item in "${steps[@]}"; do for item in "${steps[@]}"; do
if [ "$item" = "$lastStep" ]; then if [ "$item" = "$lastStep" ]; then
found=true found=true