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

Use local IFS

This commit is contained in:
Santiago Lo Coco 2021-12-25 19:30:47 -03:00
parent bdcdf47ab0
commit 4eba32a5b8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
install.sh
View File

@ -24,10 +24,9 @@ updateSystemClock() {
} }
showDisks() { showDisks() {
IFS_ORIG=$IFS local IFS=$'\n'
IFS=$'\n' setDelimiters ""
formatOptions $(lsblk -d -p -n -l -o NAME,SIZE -e 7,11) formatOptions $(lsblk -d -p -n -l -o NAME,SIZE -e 7,11)
IFS=$IFS_ORIG
result=$(whiptail --title "Select a disk" --menu "" 0 0 0 "${options[@]}" 3>&1 1>&2 2>&3) result=$(whiptail --title "Select a disk" --menu "" 0 0 0 "${options[@]}" 3>&1 1>&2 2>&3)
disk=${result%%\ *} disk=${result%%\ *}
@ -83,6 +82,7 @@ generateFstab() {
setTimeZone() { setTimeZone() {
whiptail --msgbox "Now we will set the timezone." 0 0 whiptail --msgbox "Now we will set the timezone." 0 0
setDelimiters ""
formatOptions $(ls -l /usr/share/zoneinfo/ | grep '^d' | awk '{printf $9" \n"}' | awk '!/posix/ && !/right/') formatOptions $(ls -l /usr/share/zoneinfo/ | grep '^d' | awk '{printf $9" \n"}' | awk '!/posix/ && !/right/')
region=$(whiptail --title "Region" --menu "" 0 0 0 "${options[@]}" 3>&1 1>&2 2>&3) region=$(whiptail --title "Region" --menu "" 0 0 0 "${options[@]}" 3>&1 1>&2 2>&3)
formatOptions $(ls -l /usr/share/zoneinfo/${region} | grep -v '^d' | awk '{printf $9" \n"}') formatOptions $(ls -l /usr/share/zoneinfo/${region} | grep -v '^d' | awk '{printf $9" \n"}')
@ -135,7 +135,7 @@ grubSetUp() {
} }
askForPassword() { askForPassword() {
password=$(whiptail --inputbox "Enter the ${1} password." 0 0 3>&1 1>&2 2>&3) password=$(whiptail --inputbox "Enter the password for ${1}." 0 0 3>&1 1>&2 2>&3)
passwordRep=$(whiptail --inputbox "Reenter password." 0 0 3>&1 1>&2 2>&3) passwordRep=$(whiptail --inputbox "Reenter password." 0 0 3>&1 1>&2 2>&3)
while ! [ "$password" = "$passwordRep" ]; do while ! [ "$password" = "$passwordRep" ]; do
password=$(whiptail --inputbox "Passwords do not match! Please enter the password again." 0 0 3>&1 1>&2 2>&3) password=$(whiptail --inputbox "Passwords do not match! Please enter the password again." 0 0 3>&1 1>&2 2>&3)