root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

simplify while loops

Browse source
This commit is contained in:
Tobias Powalowski 2024-06-04 14:34:29 +02:00
parent 0541f859e4
commit 02f190c906
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
usr/lib/archboot/installer/blockdevices.sh
View file

@ -408,8 +408,7 @@ _dialog --msgbox "$(cat /usr/lib/archboot/installer/help/md.txt)" 0 0
_createmd() _createmd()
{ {
_MDFINISH="" while true; do
while [[ "${_MDFINISH}" != "DONE" ]]; do
_activate_special_devices _activate_special_devices
: >/tmp/.raid : >/tmp/.raid
: >/tmp/.raid-spare : >/tmp/.raid-spare
@ -466,7 +465,7 @@ _createmd()
fi fi
# add more devices # add more devices
# raid0 doesn't support missing devices # raid0 doesn't support missing devices
if [[ "${_LEVEL}" == "raid0" || "${_LEVEL}" == "linear" || -n ${_DEGRADED} ]]; then if [[ "${_LEVEL}" == "raid0" || "${_LEVEL}" == "linear" || -n "${_DEGRADED}" ]]; then
#shellcheck disable=SC2086 #shellcheck disable=SC2086
_dialog --no-cancel --menu "Select additional device ${_RAIDNUMBER}:" \ _dialog --no-cancel --menu "Select additional device ${_RAIDNUMBER}:" \
21 50 13 ${_DEVS} "> DONE" "Proceed To Summary" 2>"${_ANSWER}" || return 1 21 50 13 ${_DEVS} "> DONE" "Proceed To Summary" 2>"${_ANSWER}" || return 1
@ -477,7 +476,7 @@ _createmd()
fi fi
_DEV=$(cat "${_ANSWER}") _DEV=$(cat "${_ANSWER}")
[[ "${_DEV}" == "> DONE" ]] && break [[ "${_DEV}" == "> DONE" ]] && break
if [[ "${_DEV}" == "> MISSING" && -z ${_DEGRADED} ]]; then if [[ "${_DEV}" == "> MISSING" && -z "${_DEGRADED}" ]]; then
_DEGRADED="missing" _DEGRADED="missing"
echo "${_DEGRADED}" >>/tmp/.raid echo "${_DEGRADED}" >>/tmp/.raid
_DEV="" _DEV=""
@ -493,7 +492,7 @@ _createmd()
done done
# final step ask if everything is ok? # final step ask if everything is ok?
# shellcheck disable=SC2028 # shellcheck disable=SC2028
_dialog --yesno "Would you like to create ${_RAIDDEV} like this?\n\nLEVEL:\n${_LEVEL}\n\nDEVICES:\n$(while read -r dev;do echo "${dev}\n"; done < /tmp/.raid)\nSPARES:\n$(while read -r dev;do echo "${dev}\n"; done < tmp/.raid-spare)" 0 0 && _MDFINISH="DONE" _dialog --yesno "Would you like to create ${_RAIDDEV} like this?\n\nLEVEL:\n${_LEVEL}\n\nDEVICES:\n$(while read -r dev;do echo "${dev}\n"; done < /tmp/.raid)\nSPARES:\n$(while read -r dev;do echo "${dev}\n"; done < tmp/.raid-spare)" 0 0 && break
done done
_umountall _umountall
_DEVS="$(echo -n "$(cat /tmp/.raid)")" _DEVS="$(echo -n "$(cat /tmp/.raid)")"
@ -539,8 +538,7 @@ _dialog --msgbox "$(cat /usr/lib/archboot/installer/help/lvm2.txt)" 0 0
_createpv() _createpv()
{ {
_PVFINISH="" while true; do
while [[ "${_PVFINISH}" != "> DONE" ]]; do
_activate_special_devices _activate_special_devices
: >/tmp/.pvs-create : >/tmp/.pvs-create
_dialog --no-mouse --infobox "Scanning blockdevices... This may need some time." 3 60 _dialog --no-mouse --infobox "Scanning blockdevices... This may need some time." 3 60
@ -579,7 +577,7 @@ _createpv()
echo "${_DEV}" >>/tmp/.pvs-create echo "${_DEV}" >>/tmp/.pvs-create
done done
# final step ask if everything is ok? # final step ask if everything is ok?
_dialog --yesno "Would you like to create physical volume on devices below?\n$(sed -e 's#$#\\n#g' /tmp/.pvs-create)" 0 0 && _PVFINISH="DONE" _dialog --yesno "Would you like to create physical volume on devices below?\n$(sed -e 's#$#\\n#g' /tmp/.pvs-create)" 0 0 && break
done done
_DEV="$(echo -n "$(cat /tmp/.pvs-create)")" _DEV="$(echo -n "$(cat /tmp/.pvs-create)")"
#shellcheck disable=SC2028,SC2086 #shellcheck disable=SC2028,SC2086