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

shellcheck fixes

Browse source
This commit is contained in:
Tobias Powalowski 2024-06-28 22:26:42 +02:00
parent 3426ffcb20
commit fa89673fad
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
usr/lib/archboot/installer/autoconfiguration.sh
View file

@ -120,6 +120,7 @@ _auto_testing()
{ {
if rg -q '^\[core-testing' /etc/pacman.conf; then if rg -q '^\[core-testing' /etc/pacman.conf; then
_progress "53" "Enable [testing] repository on installed system..." _progress "53" "Enable [testing] repository on installed system..."
#shellcheck disable=SC2016
sd '^#(\[[c,e].*-testing\]\n)#' '$1' "${_DESTDIR}"/etc/pacman.conf sd '^#(\[[c,e].*-testing\]\n)#' '$1' "${_DESTDIR}"/etc/pacman.conf
sleep 2 sleep 2
fi fi

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

@ -421,7 +421,7 @@ _createmd()
while [[ -z "${_RAIDDEV}" ]]; do while [[ -z "${_RAIDDEV}" ]]; do
_dialog --inputbox "Enter the node name for the raiddevice:\n/dev/md[number]\n/dev/md0\n/dev/md1\n\n" 12 50 "/dev/md0" 2>"${_ANSWER}" || return 1 _dialog --inputbox "Enter the node name for the raiddevice:\n/dev/md[number]\n/dev/md0\n/dev/md1\n\n" 12 50 "/dev/md0" 2>"${_ANSWER}" || return 1
_RAIDDEV=$(cat "${_ANSWER}") _RAIDDEV=$(cat "${_ANSWER}")
if rg -q "^${_RAIDDEV//\/dev\//}" /proc/mdstat 2>${_NO_LOG}; then if rg -q "^${_RAIDDEV//\/dev\//}" /proc/mdstat 2>"${_NO_LOG}"; then
_dialog --msgbox "ERROR: You have defined 2 identical node names! Please enter another name." 8 65 _dialog --msgbox "ERROR: You have defined 2 identical node names! Please enter another name." 8 65
_RAIDDEV="" _RAIDDEV=""
fi fi

2
usr/lib/archboot/installer/common.sh
View file

@ -124,7 +124,7 @@ _auto_packages() {
fi fi
#shellcheck disable=SC2010 #shellcheck disable=SC2010
# Add iwd, if wlan is detected # Add iwd, if wlan is detected
if ls /sys/class/net | rg -q 'wlan'; then if fd . /sys/class/net | rg -q 'wlan'; then
! echo "${_PACKAGES}" | rg -qw 'iwd' && _PACKAGES="${_PACKAGES} iwd" ! echo "${_PACKAGES}" | rg -qw 'iwd' && _PACKAGES="${_PACKAGES} iwd"
fi fi
# Add broadcom-wl, if module is detected # Add broadcom-wl, if module is detected