Removed printer/audio & Fixed installation process
This commit is contained in:
Nico Jensch
parent
47bc2445e5
commit
f70b5d0399
6 changed files with 96 additions and 81 deletions
|
|
@ -36,12 +36,71 @@ function upgrade2ultimate
|
|||
snapd
|
||||
snapd-glib
|
||||
flatpak" >> /tmp/setup-assistant/pkgs.txt
|
||||
echo "sudo systemctl enable --now snapd.socket" >> /tmp/setup-assistant/setup.sh
|
||||
echo "sudo systemctl enable --now apparmor.service" >> /tmp/setup-assistant/setup.sh
|
||||
echo "sudo systemctl enable --now snapd.apparmor.service" >> /tmp/setup-assistant/setup.sh
|
||||
echo "sudo systemctl enable --now snapd.socket" >> /tmp/setup-assistant/setup_root.sh
|
||||
echo "sudo systemctl enable --now apparmor.service" >> /tmp/setup-assistant/setup_root.sh
|
||||
echo "sudo systemctl enable --now snapd.apparmor.service" >> /tmp/setup-assistant/setup_root.sh
|
||||
fi
|
||||
|
||||
|
||||
if pacman -Qs plasma-desktop > /dev/null ; then
|
||||
if ! yad \
|
||||
--image='plasmashell' \
|
||||
--title="Upgrade to ULTIMATE 👾" \
|
||||
--window-icon='update' \
|
||||
--geometry=700x100 \
|
||||
--button=No:0 \
|
||||
--button=Yes:1 \
|
||||
--text-align=center \
|
||||
--center \
|
||||
--text "Do you want to install additional KDE applications?"; then
|
||||
echo "elisa
|
||||
khelpcenter
|
||||
krdc
|
||||
krfb
|
||||
kompare
|
||||
krita
|
||||
krename
|
||||
ksystemlog
|
||||
kmouth
|
||||
lokalize
|
||||
kup
|
||||
audiocd-kio
|
||||
kmag
|
||||
kimtoy
|
||||
kleopatra
|
||||
qt5-imageformats
|
||||
kimageformats
|
||||
vlc" >> /tmp/setup-assistant/pkgs.txt
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if pacman -Qs gnome-shell > /dev/null ; then
|
||||
if ! yad \
|
||||
--image='gnome-shell' \
|
||||
--title="Upgrade to ULTIMATE 👾" \
|
||||
--window-icon='update' \
|
||||
--geometry=700x100 \
|
||||
--button=No:0 \
|
||||
--button=Yes:1 \
|
||||
--text-align=center \
|
||||
--center \
|
||||
--text "Do you want to install additional GNOME applications?"; then
|
||||
echo "gpaste
|
||||
eog-plugins
|
||||
grilo-plugins
|
||||
seahorse-nautilus
|
||||
gtkhash-nautilus
|
||||
gnome-logs
|
||||
gnome-remote-desktop
|
||||
gnome-sound-recorder
|
||||
vino
|
||||
rygel
|
||||
shotwell" >> /tmp/setup-assistant/pkgs.txt
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if ! yad \
|
||||
--image='pattern-games' \
|
||||
--title="Upgrade to ULTIMATE 👾" \
|
||||
|
|
@ -53,62 +112,11 @@ function upgrade2ultimate
|
|||
--center \
|
||||
--text "Are you a gamer? The Garuda Gamer app will be installed for further configuration."; then
|
||||
echo "garuda-gamer" >> /tmp/setup-assistant/pkgs.txt
|
||||
echo "systemctl --user enable --now gamemoded >/dev/null 2>&1 &" >> /tmp/setup-assistant/setup.sh
|
||||
echo "sudo setup_dxvk install 2>&1 &" >> /tmp/setup-assistant/setup.sh
|
||||
echo "systemctl --user enable --now gamemoded >/dev/null 2>&1 &" >> /tmp/setup-assistant/setup_user.sh
|
||||
echo "sudo setup_dxvk install 2>&1 &" >> /tmp/setup-assistant/setup_root.sh
|
||||
fi
|
||||
|
||||
|
||||
yad \
|
||||
--image='org.pulseaudio.pavucontrol' \
|
||||
--title="Upgrade to ULTIMATE 👾" \
|
||||
--window-icon='update' \
|
||||
--text "We have metapkgs for these audio systems:" \
|
||||
--geometry=600x400 \
|
||||
--list \
|
||||
--checklist \
|
||||
--column=Install \
|
||||
--column=Software \
|
||||
--center < /usr/lib/setup-assistant/audio.txt > /tmp/setup-assistant/audio.txt
|
||||
|
||||
if grep -R "PulseAudio" /tmp/setup-assistant/audio.txt; then
|
||||
echo "garuda-pulse
|
||||
pulseaudio-ctl
|
||||
playerctl" >> /tmp/setup-assistant/pkgs.txt
|
||||
echo "sudo systemctl enable --now bluetooth-autoconnect" >> /tmp/setup-assistant/setup.sh
|
||||
echo "systemctl enable pulseaudio-bluetooth-autoconnect --user" >> /tmp/setup-assistant/setup.sh
|
||||
fi
|
||||
if grep -R "Alsa" /tmp/setup-assistant/audio.txt; then
|
||||
echo "garuda-alsa" >> /tmp/setup-assistant/pkgs.txt
|
||||
fi
|
||||
if grep -R "Pipewire" /tmp/setup-assistant/audio.txt; then
|
||||
echo "garuda-pipewire" >> /tmp/setup-assistant/pkgs.txt
|
||||
fi
|
||||
|
||||
|
||||
yad \
|
||||
--image='cupsprinter' \
|
||||
--title="Upgrade to ULTIMATE 👾" \
|
||||
--window-icon='update' \
|
||||
--text "We have metapkgs for these:" \
|
||||
--geometry=600x400 \
|
||||
--list \
|
||||
--checklist \
|
||||
--column=Install \
|
||||
--column=Software \
|
||||
--center < /usr/lib/setup-assistant/printing.txt > /tmp/setup-assistant/printing.txt
|
||||
|
||||
if grep -R "Printing" /tmp/setup-assistant/printing.txt; then
|
||||
echo "garuda-printer" >> /tmp/setup-assistant/pkgs.txt
|
||||
fi
|
||||
if grep -R "Scanning" /tmp/setup-assistant/printing.txt; then
|
||||
echo "garuda-scanner" >> /tmp/setup-assistant/pkgs.txt
|
||||
fi
|
||||
if grep -R "Samba" /tmp/setup-assistant/printing.txt; then
|
||||
echo "garuda-settings-samba
|
||||
system-config-samba" >> /tmp/setup-assistant/pkgs.txt
|
||||
fi
|
||||
|
||||
|
||||
yad \
|
||||
--image='libreoffice-main' \
|
||||
--title="Upgrade to ULTIMATE 👾" \
|
||||
|
|
@ -140,6 +148,9 @@ function upgrade2ultimate
|
|||
if grep -R "Free Office" /tmp/setup-assistant/office.txt; then
|
||||
echo "freeoffice" >> /tmp/setup-assistant/pkgs.txt
|
||||
fi
|
||||
if grep -R "Microsoft Office" /tmp/setup-assistant/office.txt; then
|
||||
echo "ms-office-online" >> /tmp/setup-assistant/pkgs.txt
|
||||
fi
|
||||
if grep -R "Yozo Office" /tmp/setup-assistant/office.txt; then
|
||||
echo "yozo-office
|
||||
yozo-office-fonts" >> /tmp/setup-assistant/pkgs.txt
|
||||
|
|
@ -232,6 +243,12 @@ function upgrade2ultimate
|
|||
if grep -R "GIMP" /tmp/setup-assistant/multimedia.txt; then
|
||||
echo "gimp" >> /tmp/setup-assistant/pkgs.txt
|
||||
fi
|
||||
if grep -R "Krita" /tmp/setup-assistant/multimedia.txt; then
|
||||
echo "krita" >> /tmp/setup-assistant/pkgs.txt
|
||||
fi
|
||||
if grep -R "Olivia" /tmp/setup-assistant/multimedia.txt; then
|
||||
echo "olivia" >> /tmp/setup-assistant/pkgs.txt
|
||||
fi
|
||||
if grep -R "Inkscape" /tmp/setup-assistant/multimedia.txt; then
|
||||
echo "inkscape" >> /tmp/setup-assistant/pkgs.txt
|
||||
fi
|
||||
|
|
@ -261,15 +278,10 @@ function upgrade2ultimate
|
|||
fi
|
||||
|
||||
|
||||
if [ -e "/tmp/setup-assistant/prepare.sh" ]; then
|
||||
sh /tmp/setup-assistant/prepare.sh
|
||||
fi
|
||||
alacritty -e sh /usr/lib/setup-assistant/apply.sh
|
||||
|
||||
cat /tmp/setup-assistant/pkgs.txt | sed '/^$/d;s/[[:blank:]]//g' > /tmp/setup-assistant/pkgs-install.txt
|
||||
alacritty -e sudo pacman "--needed -S - < /tmp/setup-assistant/pkgs-install.txt"
|
||||
|
||||
if [ -e "/tmp/setup-assistant/setup.sh" ]; then
|
||||
sh /tmp/setup-assistant/setup.sh
|
||||
if [ -e "/tmp/setup-assistant/setup_user.sh" ]; then
|
||||
sh /tmp/setup-assistant/setup_user.sh
|
||||
fi
|
||||
|
||||
rm -rf /tmp/setup-assistant
|
||||
|
|
@ -293,8 +305,7 @@ if ! yad \
|
|||
--text-align=center \
|
||||
--center \
|
||||
--text "Do you want to get a recent mirrorlist and refresh mirrors?"; then
|
||||
reflector-simple >/dev/null 2>&1
|
||||
alacritty -e sudo pacman "-Syy"
|
||||
reflector-simple >/dev/null 2>&1
|
||||
fi
|
||||
|
||||
if ! yad \
|
||||
|
|
@ -307,7 +318,7 @@ if ! yad \
|
|||
--text-align=center \
|
||||
--center \
|
||||
--text "Update the system? (recommended!)"; then
|
||||
alacritty -e sudo pacman "-Syu"
|
||||
alacritty -e sudo pacman "-Syyu"
|
||||
fi
|
||||
|
||||
if ! yad \
|
||||
|
|
|
|||
12
usr/lib/setup-assistant/apply.sh
Normal file
12
usr/lib/setup-assistant/apply.sh
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
#!/bin/bash
|
||||
if [ -e "/tmp/setup-assistant/prepare.sh" ]; then
|
||||
sudo sh /tmp/setup-assistant/prepare.sh
|
||||
fi
|
||||
|
||||
cat /tmp/setup-assistant/pkgs.txt | sed '/^$/d;s/[[:blank:]]//g' > /tmp/setup-assistant/pkgs-install.txt
|
||||
|
||||
sudo pacman --needed --noconfirm -S - < /tmp/setup-assistant/pkgs-install.txt
|
||||
|
||||
if [ -e "/tmp/setup-assistant/setup.sh" ]; then
|
||||
sh /tmp/setup-assistant/setup_root.sh
|
||||
fi
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
true
|
||||
PulseAudio (contains bluetooth autoconnect)
|
||||
false
|
||||
Alsa
|
||||
false
|
||||
Pipewire
|
||||
false
|
||||
My audio works fine, I dont need any of these
|
||||
|
|
@ -15,10 +15,14 @@ Easytag (Audio tag editor)
|
|||
false
|
||||
GIMP
|
||||
false
|
||||
Krita (KDE picture editor)
|
||||
false
|
||||
Inkscape
|
||||
false
|
||||
Blender
|
||||
false
|
||||
Olivia (Music player with YouTube support)
|
||||
false
|
||||
Gcolor3
|
||||
false
|
||||
No multimedia software
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ OnlyOffice (Aims to be compatible with Microsoft Office)
|
|||
false
|
||||
WPS Office
|
||||
false
|
||||
Microsoft Office (Online wrapper)
|
||||
false
|
||||
Free Office
|
||||
false
|
||||
Yozo Office
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
false
|
||||
Printing
|
||||
false
|
||||
Scanning
|
||||
false
|
||||
Samba (Windoze filesharing protocol)
|
||||
Loading…
Reference in a new issue