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

replace sed with sd

Browse source
This commit is contained in:
Tobias Powalowski 2024-06-28 09:51:21 +02:00
parent f09635ba4c
commit d3751f188f
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -291,12 +291,12 @@ _umountall()
_stopmd() _stopmd()
{ {
_DISABLEMD="" _DISABLEMD=""
if rg -q ^md /proc/mdstat 2>"${_NO_LOG}"; then if rg -q '^md' /proc/mdstat 2>"${_NO_LOG}"; then
_dialog --defaultno --yesno "Setup detected already running software raid device(s)...\n\nDo you want to delete ALL of them completely?\nWARNING: ALL DATA ON THEM WILL BE LOST!" 0 0 && _DISABLEMD=1 _dialog --defaultno --yesno "Setup detected already running software raid device(s)...\n\nDo you want to delete ALL of them completely?\nWARNING: ALL DATA ON THEM WILL BE LOST!" 0 0 && _DISABLEMD=1
if [[ -n "${_DISABLEMD}" ]]; then if [[ -n "${_DISABLEMD}" ]]; then
_umountall _umountall
# shellcheck disable=SC2013 # shellcheck disable=SC2013
for dev in $(rg -o '(^md.*) ' -r '$1' /proc/mdstat); do for dev in $(rg -o '(^md.*) :' -r '$1' /proc/mdstat); do
wipefs -a -f "/dev/${dev}" &>"${_NO_LOG}" wipefs -a -f "/dev/${dev}" &>"${_NO_LOG}"
mdadm --manage --stop "/dev/${dev}" &>"${_LOG}" mdadm --manage --stop "/dev/${dev}" &>"${_LOG}"
done done
@ -565,7 +565,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 && break _dialog --yesno "Would you like to create physical volume on devices below?\n$(sd '$' '\\n' /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
@ -650,7 +650,7 @@ _createvg()
echo "${_PV}" >>/tmp/.pvs echo "${_PV}" >>/tmp/.pvs
done done
# final step ask if everything is ok? # final step ask if everything is ok?
_dialog --yesno "Would you like to create Volume Group like this?\n\n${_VGDEV}\n\nPhysical Volumes:\n$(sed -e 's#$#\\n#g' /tmp/.pvs)" 0 0 && break _dialog --yesno "Would you like to create Volume Group like this?\n\n${_VGDEV}\n\nPhysical Volumes:\n$(sd '$' '\\n' /tmp/.pvs)" 0 0 && break
done done
_PV="$(echo -n "$(cat /tmp/.pvs)")" _PV="$(echo -n "$(cat /tmp/.pvs)")"
_umountall _umountall
@ -697,7 +697,7 @@ _createlv()
elif [[ "${_LV_SIZE}" == 0 ]]; then elif [[ "${_LV_SIZE}" == 0 ]]; then
_dialog --msgbox "ERROR: You have entered a invalid size, please enter again." 0 0 _dialog --msgbox "ERROR: You have entered a invalid size, please enter again." 0 0
else else
if [[ "${_LV_SIZE}" -ge "$(vgs -o vg_free --noheading --units M | sed -e 's#m##g')" ]]; then if [[ "${_LV_SIZE}" -ge "$(vgs -o vg_free --noheading --units M | sd 'm' '')" ]]; then
_dialog --msgbox "ERROR: You have entered a too large size, please enter again." 0 0 _dialog --msgbox "ERROR: You have entered a too large size, please enter again." 0 0
else else
break break