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

fix choose on empty string

Browse source
This commit is contained in:
Tobias Powalowski 2024-07-29 10:15:31 +02:00
parent f56ee77390
commit e5580e63be
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
usr/lib/archboot/installer/mountpoints.sh
View file

@ -135,6 +135,7 @@ _check_mkfs_values() {
[[ -z "${_BTRFS_LEVEL}" ]] && _BTRFS_LEVEL="NONE" [[ -z "${_BTRFS_LEVEL}" ]] && _BTRFS_LEVEL="NONE"
[[ -z "${_LABEL_NAME}" && -n "$(${_LSBLK} LABEL "${_DEV}")" ]] && _LABEL_NAME="$(${_LSBLK} LABEL "${_DEV}" 2>"${_NO_LOG}")" [[ -z "${_LABEL_NAME}" && -n "$(${_LSBLK} LABEL "${_DEV}")" ]] && _LABEL_NAME="$(${_LSBLK} LABEL "${_DEV}" 2>"${_NO_LOG}")"
[[ -z "${_LABEL_NAME}" ]] && _LABEL_NAME="NONE" [[ -z "${_LABEL_NAME}" ]] && _LABEL_NAME="NONE"
[[ -z "${_DOMKFS}" ]] && _DOMKFS="0"
} }
_run_mkfs() { _run_mkfs() {
@ -187,7 +188,7 @@ _create_filesystem() {
_BTRFS_LEVEL="" _BTRFS_LEVEL=""
_SKIP_FILESYSTEM="" _SKIP_FILESYSTEM=""
[[ -z "${_DOMKFS}" ]] && _dialog --yesno "Would you like to create a filesystem on ${_DEV}?\n\n(This will overwrite existing data!)" 0 0 && _DOMKFS=1 [[ -z "${_DOMKFS}" ]] && _dialog --yesno "Would you like to create a filesystem on ${_DEV}?\n\n(This will overwrite existing data!)" 0 0 && _DOMKFS=1
if [[ -n "${_DOMKFS}" ]]; then if [[ "${_DOMKFS}" == "1" ]]; then
[[ "${_FSTYPE}" == "swap" || "${_FSTYPE}" == "vfat" ]] || _select_filesystem || return 1 [[ "${_FSTYPE}" == "swap" || "${_FSTYPE}" == "vfat" ]] || _select_filesystem || return 1
while [[ -z "${_LABEL_NAME}" ]]; do while [[ -z "${_LABEL_NAME}" ]]; do
_dialog --no-cancel --title " LABEL Name on ${_DEV} " --inputbox "Keep it short and use no spaces or special characters." 8 60 \ _dialog --no-cancel --title " LABEL Name on ${_DEV} " --inputbox "Keep it short and use no spaces or special characters." 8 60 \
@ -375,7 +376,7 @@ _mountpoints() {
elif [[ "${_FSTYPE}" == "bcachefs" ]]; then elif [[ "${_FSTYPE}" == "bcachefs" ]]; then
echo "${_DEV}|${_FSTYPE}|${_MP}|${_DOMKFS}|${_LABEL_NAME}|${_FS_OPTIONS}|${_BCFS_DEVS}|${_BCFS_COMPRESS}" >>/tmp/.parts echo "${_DEV}|${_FSTYPE}|${_MP}|${_DOMKFS}|${_LABEL_NAME}|${_FS_OPTIONS}|${_BCFS_DEVS}|${_BCFS_COMPRESS}" >>/tmp/.parts
# remove members of multi devices # remove members of multi devices
if [[ -z "${_DOMKFS}" ]]; then if [[ "${_DOMKFS}" == "0" ]]; then
_BCFS_UUID="$(${_LSBLK} UUID -d "${_DEV}")" _BCFS_UUID="$(${_LSBLK} UUID -d "${_DEV}")"
for i in $(${_LSBLK} NAME,UUID | rg -o "(.*) ${_BCFS_UUID}" -r '$1'); do for i in $(${_LSBLK} NAME,UUID | rg -o "(.*) ${_BCFS_UUID}" -r '$1'); do
_DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${i}" 2>"${_NO_LOG}")/}" _DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${i}" 2>"${_NO_LOG}")/}"
@ -428,7 +429,7 @@ _mountpoints() {
# returns: 1 on failure # returns: 1 on failure
_mkfs() { _mkfs() {
[[ -f "/tmp/.mp-error" ]] && rm /tmp/.mp-error [[ -f "/tmp/.mp-error" ]] && rm /tmp/.mp-error
if [[ -n "${4}" ]]; then if [[ "${4}" == "1" ]]; then
if [[ "${2}" == "swap" ]]; then if [[ "${2}" == "swap" ]]; then
_progress "${_COUNT}" "Creating and activating swapspace on ${1}..." _progress "${_COUNT}" "Creating and activating swapspace on ${1}..."
else else
@ -446,7 +447,7 @@ _mkfs() {
_MOUNTOPTIONS="" _MOUNTOPTIONS=""
if [[ "${2}" == "swap" ]]; then if [[ "${2}" == "swap" ]]; then
swapoff -a &>"${_NO_LOG}" swapoff -a &>"${_NO_LOG}"
if [[ -n "${4}" ]]; then if [[ "${4}" == "1" ]]; then
if echo "${1}" | rg -q '^/dev'; then if echo "${1}" | rg -q '^/dev'; then
mkswap -L "${6}" "${1}" &>"${_LOG}" || : >/tmp/.mp-error mkswap -L "${6}" "${1}" &>"${_LOG}" || : >/tmp/.mp-error
else else
@ -480,7 +481,7 @@ _mkfs() {
fi fi
else else
# if we were tasked to create the filesystem, do so # if we were tasked to create the filesystem, do so
if [[ -n "${4}" ]]; then if [[ "${4}" == "1" ]]; then
#shellcheck disable=SC2086 #shellcheck disable=SC2086
case ${2} in case ${2} in
# don't handle anything else here, we will error later # don't handle anything else here, we will error later
@ -554,7 +555,7 @@ _mkfs() {
fi fi
fi fi
# btrfs needs balancing on fresh created raid, else weird things could happen # btrfs needs balancing on fresh created raid, else weird things could happen
[[ "${2}" == "btrfs" && -n "${4}" ]] && btrfs balance start --full-balance "${3}""${5}" &>"${_LOG}" [[ "${2}" == "btrfs" && "${4}" == "1" ]] && btrfs balance start --full-balance "${3}""${5}" &>"${_LOG}"
fi fi
# add to .device-names for config files # add to .device-names for config files
#shellcheck disable=SC2155 #shellcheck disable=SC2155