mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
shellcheck fixes
This commit is contained in:
parent
bbdd66e4bb
commit
e2c9957b46
2 changed files with 4 additions and 3 deletions
|
@ -109,7 +109,7 @@ _progress_wait() {
|
|||
_progress "${2}" "${3}"
|
||||
fi
|
||||
_COUNT="$((_COUNT+1))"
|
||||
read -t "${4}"
|
||||
read -r -t "${4}"
|
||||
done
|
||||
}
|
||||
|
||||
|
@ -311,11 +311,11 @@ _cachedir_check() {
|
|||
_pacman_keyring() {
|
||||
# pacman-key process itself
|
||||
while pgrep -x pacman-key &>"${_NO_LOG}"; do
|
||||
read -t 1
|
||||
read -r -t 1
|
||||
done
|
||||
# gpg finished in background
|
||||
while pgrep -x gpg &>"${_NO_LOG}"; do
|
||||
read -t 1
|
||||
read .r -t 1
|
||||
done
|
||||
if [[ -e /etc/systemd/system/pacman-init.service ]]; then
|
||||
systemctl stop pacman-init.service
|
||||
|
|
|
@ -114,6 +114,7 @@ _prepare_browser() {
|
|||
fi
|
||||
_firefox_flags
|
||||
else
|
||||
#shellcheck disable=SC2046
|
||||
pacman -Q firefox &>"${_NO_LOG}" && pacman -R --noconfirm $(pacman -Q | grep firefox | cut -d ' ' -f 1) &>"${_LOG}"
|
||||
pacman -Q chromium &>"${_NO_LOG}" || _run_pacman chromium
|
||||
_chromium_flags
|
||||
|
|
Loading…
Reference in a new issue