Skip to content
This repository was archived by the owner on Jan 18, 2026. It is now read-only.

Commit a86f7b6

Browse files
deadhead420deadhead420
committed
Impliment optional extra packages, cleanup
1 parent cdc4a74 commit a86f7b6

1 file changed

Lines changed: 47 additions & 92 deletions

File tree

‎lib/configure_quick.sh‎

Lines changed: 47 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -3,106 +3,46 @@
33
quick_install() {
44
case "${install_opt}" in
55
Anarchy-Desktop) kernel="linux"
6-
sh="/usr/bin/zsh"
7-
shrc="${default}"
8-
bootloader="grub"
9-
net_util="networkmanager"
10-
enable_nm=true
11-
multilib=true
12-
dhcp=true
136
desktop=true
14-
base_install="base-devel linux linux-headers zsh zsh-syntax-highlighting grub dialog networkmanager wireless_tools wpa_supplicant os-prober ${base_defaults} "
15-
16-
if "${bluetooth}" ; then
17-
base_install+="bluez bluez-utils pulseaudio-bluetooth "
18-
enable_bt=true
19-
fi
20-
21-
if "${enable_f2fs}" ; then
22-
base_install+="f2fs-tools "
23-
fi
24-
25-
if "${UEFI}" ; then
26-
base_install+="efibootmgr "
27-
fi
28-
7+
base_install="base-devel linux linux-headers ${base_defaults} ${base_defaults_ex} "
298
quick_desktop
309
base_install+="${DE} "
3110
;;
3211
Anarchy-Desktop-LTS) kernel="linux-lts"
33-
sh="/usr/bin/zsh"
34-
shrc="${default}"
35-
bootloader="grub"
36-
net_util="networkmanager"
37-
enable_nm=true
38-
multilib=true
39-
dhcp=true
4012
desktop=true
41-
base_install="base-devel linux-lts linux-lts-headers zsh zsh-syntax-highlighting grub dialog networkmanager wireless_tools wpa_supplicant os-prober ${base_defaults} "
42-
43-
if "${bluetooth}" ; then
44-
base_install+="bluez bluez-utils pulseaudio-bluetooth "
45-
enable_bt=true
46-
fi
47-
48-
if "${enable_f2fs}" ; then
49-
base_install+="f2fs-tools "
50-
fi
51-
52-
if "${UEFI}" ; then
53-
base_install+="efibootmgr "
54-
fi
55-
13+
base_install="base-devel linux-lts linux-lts-headers ${base_defaults} ${base_defaults_ex} "
5614
quick_desktop
5715
base_install+="${DE} "
5816
;;
5917
Anarchy-Server) kernel="linux"
60-
sh="/usr/bin/zsh"
61-
shrc="${default}"
62-
bootloader="grub"
63-
net_util="networkmanager"
64-
enable_nm=true
65-
multilib=true
66-
dhcp=true
67-
base_install="base-devel linux openssh linux-headers zsh zsh-syntax-highlighting grub dialog wireless_tools wpa_supplicant os-prober ${base_defaults} "
68-
69-
if "${bluetooth}" ; then
70-
base_install+="bluez bluez-utils pulseaudio-bluetooth "
71-
enable_bt=true
72-
fi
73-
74-
if "${enable_f2fs}" ; then
75-
base_install+="f2fs-tools "
76-
fi
77-
78-
if "${UEFI}" ; then
79-
base_install+="efibootmgr "
80-
fi
18+
base_install="base-devel linux linux-headers ${base_defaults} ${base_defaults_ex} "
8119
;;
8220
Anarchy-Server-LTS) kernel="linux-lts"
83-
sh="/usr/bin/zsh"
84-
shrc="${default}"
85-
bootloader="grub"
86-
net_util="networkmanager"
87-
enable_nm=true
88-
multilib=true
89-
dhcp=true
90-
base_install="base-devel openssh linux-lts linux-lts-headers zsh zsh-syntax-highlighting grub dialog wireless_tools wpa_supplicant os-prober ${base_defaults} "
91-
92-
if "${bluetooth}" ; then
93-
base_install+="bluez bluez-utils pulseaudio-bluetooth "
94-
enable_bt=true
95-
fi
96-
97-
if "${enable_f2fs}" ; then
98-
base_install+="f2fs-tools "
99-
fi
100-
101-
if "${UEFI}" ; then
102-
base_install+="efibootmgr "
103-
fi
21+
base_install="base-devel linux-lts linux-lts-headers ${base_defaults} ${base_defaults_ex} "
22+
10423
;;
10524
esac
25+
26+
sh="/usr/bin/zsh"
27+
shrc="${default}"
28+
bootloader="grub"
29+
net_util="networkmanager"
30+
enable_nm=true
31+
multilib=true
32+
dhcp=true
33+
34+
if "${bluetooth}" ; then
35+
base_install+="bluez bluez-utils pulseaudio-bluetooth "
36+
enable_bt=true
37+
fi
38+
39+
if "${enable_f2fs}" ; then
40+
base_install+="f2fs-tools "
41+
fi
42+
43+
if "${UEFI}" ; then
44+
base_install+="efibootmgr "
45+
fi
10646

10747
}
10848

@@ -121,7 +61,14 @@ quick_desktop() {
12161
return
12262
fi
12363
else
124-
break
64+
if (dialog --yes-button "${yes}" --no-button "${no}" --yesno "\n${desktop_suite_msg}" 10 60) then
65+
suite=true
66+
fi
67+
68+
if (dialog --yes-button "${yes}" --no-button "${no}" --yesno "\n${aur_help_msg}" 10 60) then
69+
aur_helper=true
70+
fi
71+
break
12572
fi
12673
done
12774

@@ -132,26 +79,34 @@ quick_desktop() {
13279
case "${de}" in
13380
"Anarchy-xfce4") config_env="${de}"
13481
start_term="exec startxfce4"
135-
DE+="xfce4 xfce4-goodies ${extras} "
82+
DE+="xfce4 xfce4-goodies ${desktop_extras} "
13683
;;
13784
"Anarchy-budgie") config_env="${de}"
13885
start_term="export XDG_CURRENT_DESKTOP=Budgie:GNOME ; exec budgie-desktop"
139-
DE+="budgie-desktop mousepad terminator nautilus gnome-backgrounds gnome-control-center ${extras} "
86+
DE+="budgie-desktop mousepad terminator nautilus gnome-backgrounds gnome-control-center ${desktop_extras} "
14087
;;
14188
"Anarchy-cinnamon") config_env="${de}"
142-
DE+="cinnamon cinnamon-translations gnome-terminal file-roller p7zip zip unrar terminator ${extras} "
89+
DE+="cinnamon cinnamon-translations gnome-terminal file-roller p7zip zip unrar terminator ${desktop_extras} "
14390
start_term="exec cinnamon-session"
14491
;;
14592
"Anarchy-gnome") config_env="${de}"
14693
start_term="exec gnome-session"
147-
DE+="gnome gnome-extra terminator ${extras} "
94+
DE+="gnome gnome-extra terminator ${desktop_extras} "
14895
;;
14996
"Anarchy-openbox") config_env="${de}"
15097
start_term="exec openbox-session"
151-
DE+="openbox thunar thunar-volman xfce4-terminal xfce4-panel xfce4-whiskermenu-plugin xcompmgr transset-df obconf lxappearance-obconf wmctrl gxmessage xfce4-pulseaudio-plugin xfdesktop xdotool opensnap ristretto oblogout obmenu-generator polkit-gnome ${extras} "
98+
DE+="openbox thunar thunar-volman xfce4-terminal xfce4-panel xfce4-whiskermenu-plugin xcompmgr transset-df obconf lxappearance-obconf wmctrl gxmessage xfce4-pulseaudio-plugin xfdesktop xdotool opensnap ristretto oblogout obmenu-generator polkit-gnome ${desktop_extras} "
15299
;;
153100
esac
154101

102+
if "${suite}" ; then
103+
DE+="${user_extras} "
104+
fi
105+
106+
if "${aur_helper}"; then
107+
DE+="yay "
108+
fi
109+
155110
while (true) ; do
156111
if "${VM}" ; then
157112
case "${virt}" in

0 commit comments

Comments
 (0)