mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
remove not used browser
This commit is contained in:
parent
3c68b9a6fd
commit
e3427d1b47
2 changed files with 21 additions and 17 deletions
|
@ -95,21 +95,14 @@ _launcher() {
|
|||
_dialog --default-item "${_DEFAULTITEM}" --cancel-label "${_LABEL}" --title " Launcher Menu " --menu "" 9 40 5 \
|
||||
"1" "Launch Archboot Setup" "${_MENU[@]}" 2>"${_ANSWER}"
|
||||
case $(cat "${_ANSWER}") in
|
||||
"1")
|
||||
[[ -e /.launcher-running ]] && rm /.launcher-running
|
||||
setup
|
||||
exit 0 ;;
|
||||
"2")
|
||||
_DEFAULTITEM=2
|
||||
_desktop
|
||||
;;
|
||||
"3")
|
||||
_DEFAULTITEM=3
|
||||
_manage
|
||||
;;
|
||||
*)
|
||||
_exit
|
||||
;;
|
||||
"1") [[ -e /.launcher-running ]] && rm /.launcher-running
|
||||
setup
|
||||
exit 0 ;;
|
||||
"2") _DEFAULTITEM=2
|
||||
_desktop ;;
|
||||
"3") _DEFAULTITEM=3
|
||||
_manage ;;
|
||||
*) _exit ;;
|
||||
esac
|
||||
}
|
||||
|
||||
|
|
|
@ -85,8 +85,19 @@ if [[ -n "${_L_XFCE}" || -n "${_L_SWAY}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}
|
|||
# only start vnc on xorg environment
|
||||
echo "Setting up VNC and browser..." >"${_LOG}"
|
||||
[[ -n "${_L_XFCE}" ]] && _autostart_vnc
|
||||
command -v firefox &>"${_NO_LOG}" && _firefox_flags
|
||||
command -v chromium &>"${_NO_LOG}" && _chromium_flags
|
||||
# install standard browser
|
||||
_BROWSER="$(grep '_STANDARD_BROWSER' /etc/archboot/defaults | cut -d '=' -f2)"
|
||||
if ! pacman -Q ${_BROWSER} &>"${_NO_LOG}"; then
|
||||
if [[ "${_BROWSER}" == "firefox" ]]; then
|
||||
pacman -Rss --noconfirm chromium &>"${_LOG}"
|
||||
else
|
||||
pacman -Rss --noconfirm firefox &>"${_LOG}"
|
||||
fi
|
||||
pacman --noconfirm -Sy ${_BROWSER} &>"${_LOG}"
|
||||
fi
|
||||
|
||||
|
||||
_${_BROWSER}_flags
|
||||
if [[ -n "${_L_XFCE}" ]]; then
|
||||
_start_xfce | _dialog --title "${_MENU_TITLE}" --gauge "Starting ${_ENVIRONMENT}..." 6 75 99
|
||||
clear
|
||||
|
|
Loading…
Reference in a new issue