Add choice for installing base-devel
This commit is contained in:
parent
5258991023
commit
b1243fcba1
@ -119,6 +119,10 @@ _ExtPartBody1="\nWhere do you want the partition mounted?\n\nEnsure the name beg
|
|||||||
_KernelTitle="Choose Kernel"
|
_KernelTitle="Choose Kernel"
|
||||||
_KernelBody="\nSelect which kernel to use for the install."
|
_KernelBody="\nSelect which kernel to use for the install."
|
||||||
|
|
||||||
|
# base-devel
|
||||||
|
_DevelTitle="Install base-devel packages"
|
||||||
|
_DevelBody="\nDo you want base-devel installed for building AUR packages?"
|
||||||
|
|
||||||
# shell
|
# shell
|
||||||
_ShellTitle="Choose Login Shell"
|
_ShellTitle="Choose Login Shell"
|
||||||
_ShellBody="\nSelect which shell to use as the new user's login shell."
|
_ShellBody="\nSelect which shell to use as the new user's login shell."
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
|
|
||||||
# immutable globals
|
# immutable globals
|
||||||
readonly VER="1.7.24" # Installer version
|
readonly VER="1.7.25" # Installer version
|
||||||
readonly DIST="ArchLabs" # Linux distributor
|
readonly DIST="ArchLabs" # Linux distributor
|
||||||
readonly MNT="/mnt/install" # Install mountpoint
|
readonly MNT="/mnt/install" # Install mountpoint
|
||||||
readonly ERR="/tmp/errlog" # Built-in error log
|
readonly ERR="/tmp/errlog" # Built-in error log
|
||||||
@ -47,7 +47,7 @@ main()
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# setting $SELECTED to $SELECTED - 1 when a step fails retains the highlighted menu item
|
# setting $SELECTED to ($SELECTED - 1) when failing keeps the highlight
|
||||||
case $SELECTED in
|
case $SELECTED in
|
||||||
1) device_tree ;;
|
1) device_tree ;;
|
||||||
2) partition || SELECTED=1 ;;
|
2) partition || SELECTED=1 ;;
|
||||||
@ -69,9 +69,9 @@ done
|
|||||||
# trap Ctrl-C to properly exit
|
# trap Ctrl-C to properly exit
|
||||||
trap sigint INT
|
trap sigint INT
|
||||||
|
|
||||||
for arg in "$@"; do case $arg in
|
for arg in "$@"; do
|
||||||
--debug|-d) debug ;;
|
[[ $arg =~ (--debug|-d) ]] && debug
|
||||||
esac done
|
done
|
||||||
|
|
||||||
# initial prep
|
# initial prep
|
||||||
select_language
|
select_language
|
||||||
|
@ -327,7 +327,7 @@ select_wm_or_de()
|
|||||||
"bspwm" "A tiling window manager that represents windows as the leaves of a binary tree" off \
|
"bspwm" "A tiling window manager that represents windows as the leaves of a binary tree" off \
|
||||||
"gnome" "A desktop environment that aims to be simple and easy to use" off \
|
"gnome" "A desktop environment that aims to be simple and easy to use" off \
|
||||||
"cinnamon" "A desktop environment combining a traditional desktop layout with modern graphical effects" off \
|
"cinnamon" "A desktop environment combining a traditional desktop layout with modern graphical effects" off \
|
||||||
"xfce4" "A lightweight and modular desktop environment based on GTK+ 2 and 3" off)" || [[ ! $INSTALL_WMS ]]; then
|
"xfce4" "A lightweight and modular desktop environment based on GTK+ 2 and 3" off)"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -544,10 +544,12 @@ configure_system_settings()
|
|||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
tput civis
|
|
||||||
if ! KERNEL="$(menubox "$_KernelTitle" "$_KernelBody" 0 0 0 'linux' '-' 'linux-lts' '-')"; then
|
if ! KERNEL="$(menubox "$_KernelTitle" "$_KernelBody" 0 0 0 'linux' '-' 'linux-lts' '-')"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
yesno "$_DevelTitle" "$_DevelBody" && BASEDEV=true || BASEDEV=false
|
||||||
|
|
||||||
select_wm_or_de || return 1
|
select_wm_or_de || return 1
|
||||||
select_packages || return 1
|
select_packages || return 1
|
||||||
select_mirrorcmd || return 1
|
select_mirrorcmd || return 1
|
||||||
|
@ -328,7 +328,13 @@ package_operations()
|
|||||||
|
|
||||||
# iputils, base-devel, and git are all needed and should always be installed separately
|
# iputils, base-devel, and git are all needed and should always be installed separately
|
||||||
chrun "pacman -Syyu --noconfirm"
|
chrun "pacman -Syyu --noconfirm"
|
||||||
chrun "pacman -S iputils --noconfirm; pacman -S base-devel git --needed --noconfirm"
|
if [[ $BASEDEV == true ]]; then
|
||||||
|
chrun "pacman -S iputils --noconfirm; pacman -S base-devel git --needed --noconfirm" 2>/dev/null
|
||||||
|
elif [[ $BASEDEV == false && $INSTALL_WMS =~ dwm ]]; then
|
||||||
|
chrun "pacman -S iputils git --noconfirm"
|
||||||
|
else
|
||||||
|
chrun "pacman -S iputils --noconfirm"
|
||||||
|
fi
|
||||||
chrun "pacman -S $inpkg --needed --noconfirm"
|
chrun "pacman -S $inpkg --needed --noconfirm"
|
||||||
chrun "pacman -Rs $rmpkg --noconfirm"
|
chrun "pacman -Rs $rmpkg --noconfirm"
|
||||||
return 0
|
return 0
|
||||||
|
@ -16,7 +16,7 @@ declare -gA PKG_EXT=(
|
|||||||
[mpd]="mpc"
|
[mpd]="mpc"
|
||||||
[mupdf]="mupdf-tools"
|
[mupdf]="mupdf-tools"
|
||||||
[qt5ct]="qt5-styleplugins"
|
[qt5ct]="qt5-styleplugins"
|
||||||
[steam]="steam-native-runtime"
|
# [steam]="steam-native-runtime"
|
||||||
[zathura]="zathura-pdf-poppler"
|
[zathura]="zathura-pdf-poppler"
|
||||||
[cairo-dock]="cairo-dock-plug-ins"
|
[cairo-dock]="cairo-dock-plug-ins"
|
||||||
[noto-fonts]="noto-fonts-emoji"
|
[noto-fonts]="noto-fonts-emoji"
|
||||||
@ -58,7 +58,7 @@ select_terminals()
|
|||||||
"termite" "A minimal VTE-based terminal emulator" off \
|
"termite" "A minimal VTE-based terminal emulator" off \
|
||||||
"rxvt-unicode" "A unicode enabled rxvt-clone terminal emulator" off \
|
"rxvt-unicode" "A unicode enabled rxvt-clone terminal emulator" off \
|
||||||
"xterm" "The standard terminal emulator for the X window system" off \
|
"xterm" "The standard terminal emulator for the X window system" off \
|
||||||
"alacritty" "A minimal VTE-based terminal emulator" off \
|
"alacritty" "A cross-platform, GPU-accelerated terminal emulator" off \
|
||||||
"terminator" "Terminal emulator that supports tabs and grids" off \
|
"terminator" "Terminal emulator that supports tabs and grids" off \
|
||||||
"sakura" "A terminal emulator based on GTK and VTE" off \
|
"sakura" "A terminal emulator based on GTK and VTE" off \
|
||||||
"tilix" "A tiling terminal emulator for Linux using GTK+ 3" off \
|
"tilix" "A tiling terminal emulator for Linux using GTK+ 3" off \
|
||||||
|
Reference in New Issue
Block a user