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

replace sed

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-25 11:50:41 +01:00
parent 4e6da0a0b9
commit 900d1bef4a
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
usr/lib/archboot/installer/btrfs.sh
View file

@ -132,7 +132,7 @@ _select_btrfsraid_devices () {
: >/tmp/.btrfs-devices : >/tmp/.btrfs-devices
echo "${_BTRFS_DEV}" >>/tmp/.btrfs-devices echo "${_BTRFS_DEV}" >>/tmp/.btrfs-devices
#shellcheck disable=SC2001,SC2086 #shellcheck disable=SC2001,SC2086
_BTRFS_DEVS=$(echo ${_DEVS} | sed -e "s#${_BTRFS_DEV}\ _##g") _BTRFS_DEVS=${_DEVS//${_BTRFS_DEV}\ _/}
_RAIDNUMBER=2 _RAIDNUMBER=2
#shellcheck disable=SC2086 #shellcheck disable=SC2086
_dialog --menu "Select device ${_RAIDNUMBER}:" 13 50 10 ${_BTRFS_DEVS} 2>"${_ANSWER}" || return 1 _dialog --menu "Select device ${_RAIDNUMBER}:" 13 50 10 ${_BTRFS_DEVS} 2>"${_ANSWER}" || return 1
@ -147,8 +147,7 @@ _select_btrfsraid_devices () {
[[ "${_RAIDNUMBER}" -ge 4 && "${_BTRFS_LEVEL}" == "raid5" ]] && _BTRFS_DONE="DONE _" [[ "${_RAIDNUMBER}" -ge 4 && "${_BTRFS_LEVEL}" == "raid5" ]] && _BTRFS_DONE="DONE _"
[[ "${_RAIDNUMBER}" -ge 5 && "${_BTRFS_LEVEL}" == "raid10" || "${_BTRFS_LEVEL}" == "raid6" ]] && _BTRFS_DONE="DONE _" [[ "${_RAIDNUMBER}" -ge 5 && "${_BTRFS_LEVEL}" == "raid10" || "${_BTRFS_LEVEL}" == "raid6" ]] && _BTRFS_DONE="DONE _"
# clean loop from used partition and options # clean loop from used partition and options
#shellcheck disable=SC2001,SC2086 _BTRFS_DEVS=${_BTRFS_DEVS//${_BTRFS_DEV}\ _/}
_BTRFS_DEVS=$(echo ${_BTRFS_DEVS} | sed -e "s#${_BTRFS_DEV}\ _##g")
# add more devices # add more devices
#shellcheck disable=SC2086 #shellcheck disable=SC2086
_dialog --menu "Select device ${_RAIDNUMBER}:" 13 50 10 ${_BTRFS_DEVS} ${_BTRFS_DONE} 2>"${_ANSWER}" || return 1 _dialog --menu "Select device ${_RAIDNUMBER}:" 13 50 10 ${_BTRFS_DEVS} ${_BTRFS_DONE} 2>"${_ANSWER}" || return 1
@ -224,7 +223,7 @@ _choose_btrfs_subvolume () {
_subvolumes_in_use _subvolumes_in_use
for i in ${_SUBVOLUME_IN_USE}; do for i in ${_SUBVOLUME_IN_USE}; do
#shellcheck disable=SC2001,SC2086 #shellcheck disable=SC2001,SC2086
_SUBVOLUMES="$(echo ${_SUBVOLUMES} | sed -e "s#${i} _##g")" _SUBVOLUMES="${_SUBVOLUMES}//${i} _/}"
done done
if [[ -n "${_SUBVOLUMES}" ]]; then if [[ -n "${_SUBVOLUMES}" ]]; then
#shellcheck disable=SC2086 #shellcheck disable=SC2086