1
0
Fork 0
mirror of synced 2024-11-25 03:25:36 -05:00

Improved upgrade2ultimate & split pre-install, install and post-install phases

This commit is contained in:
Nico Jensch 2020-11-11 15:59:30 +01:00
parent 6418886115
commit ac5679f47e

View file

@ -19,7 +19,7 @@ function upgrade2ultimate
echo ""
read asian
if [ $asian = "y" ]; then
echo "sudo pacman -S garuda-asian" >> /tmp/setup-assistant/install-packages.sh
echo "garuda-asian" >> /tmp/setup-assistant/pkgs.txt
fi
clear
@ -28,8 +28,15 @@ function upgrade2ultimate
echo "If an application is available already we advise to use the version in the repo."
read snap
if [ $snap = "y" ]; then
echo "sudo pacman -R pamac-aur pamac-tray-appindicator && sudo pacman -Syu --noconfirm pamac-all appimagelauncher fwupd apparmor snapd snapd-glib flatpak && sudo systemctl enable --now snapd" >> /tmp/setup-assistant/install-packages.sh
echo "sudo systemctl enable --now snapd" >> /tmp/setup-assistant/install-packages.sh
echo "sudo pacman -R pamac-aur pamac-tray-appindicator" >> /tmp/setup-assistant/prepare.sh
echo "pamac-all
appimagelauncher
fwupd
apparmor
snapd
snapd-glib
flatpak" >> /tmp/setup-assistant/pkgs.txt
echo "sudo systemctl enable --now snapd" >> /tmp/setup-assistant/setup.sh
fi
clear
@ -38,7 +45,9 @@ function upgrade2ultimate
echo ""
read gaming
if [ $gaming = "y" ]; then
echo "sudo pacman -S garuda-gamer" >> /tmp/setup-assistant/install-packages.sh
echo "garuda-gamer" >> /tmp/setup-assistant/pkgs.txt
echo "systemctl --user enable --now gamemoded >/dev/null 2>&1 &" >> /tmp/setup-assistant/setup.sh
echo "setup_dxvk install 2>&1 &" >> /tmp/setup-assistant/setup.sh
fi
clear
@ -47,7 +56,11 @@ function upgrade2ultimate
echo ""
read audio
if [ $audio = "y" ]; then
echo "sudo pacman -S garuda-alsa garuda-pulse garuda-pipewire pulseaudio-ctl playerctl" >> /tmp/setup-assistant/install-packages.sh
echo "garuda-alsa
garuda-pulse
garuda-pipewire
pulseaudio-ctl
playerctl" >> /tmp/setup-assistant/pkgs.txt
fi
clear
@ -56,14 +69,17 @@ function upgrade2ultimate
echo ""
read gaming
if [ $gaming = "y" ]; then
echo "sudo pacman -S garuda-settings-samba system-config-samba garuda-printer garuda-scanner" >> /tmp/setup-assistant/install-packages.sh
echo "garuda-settings-samba
system-config-samba
garuda-printer
garuda-scanner" >> /tmp/setup-assistant/pkgs.txt
fi
clear
: office-selection
echo "Now you are free to choose your favorite office suite."
echo "There are quite a lot of them in our repo. A guideline for new users:"
echo "LibreOffice is the most used office application in the Linux world (if you need a complete suite)"
echo "LibreOffice is the most used and complete office application in the Linux world."
echo "If a simpler word processor is fine for you Abiword might also be a good choice."
echo ""
echo "1) LibreOffice"
@ -75,19 +91,23 @@ function upgrade2ultimate
echo "7) Abiword"
read office
if [ $office = "1" ]; then
echo "sudo pacman -S libreoffice-fresh libmythes" >> /tmp/setup-assistant/install-packages.sh
echo "libreoffice-fresh
libmythes" >> /tmp/setup-assistant/pkgs.txt
elif [ $office = "2" ]; then
echo "sudo pacman -S onlyoffice-bin" >> /tmp/setup-assistant/install-packages.sh
echo "onlyoffice-bin" >> /tmp/setup-assistant/pkgs.txt
elif [ $office = "3" ]; then
echo "sudo pacman -S wps-office wps-office-mime ttf-wps-fonts" >> /tmp/setup-assistant/install-packages.sh
echo "wps-office
wps-office-mime
ttf-wps-fonts" >> /tmp/setup-assistant/pkgs.txt
elif [ $office = "4" ]; then
echo "sudo pacman -S freeoffice" >> /tmp/setup-assistant/install-packages.sh
echo "freeoffice" >> /tmp/setup-assistant/pkgs.txt
elif [ $office = "5" ]; then
echo "sudo pacman -S yozo-office yozo-office-fonts" >> /tmp/setup-assistant/install-packages.sh
echo "yozo-office
yozo-office-fonts" >> /tmp/setup-assistant/pkgs.txt
elif [ $office = "6" ]; then
echo "sudo pacman -S calligra" >> /tmp/setup-assistant/install-packages.sh
echo "calligra" >> /tmp/setup-assistant/pkgs.txt
elif [ $office = "7" ]; then
echo "sudo pacman -S abiword" >> /tmp/setup-assistant/install-packages.sh
echo "abiword" >> /tmp/setup-assistant/pkgs.txt
else echo "Thats not a valid choice! ❌"
goto "office-selection"
fi
@ -96,9 +116,19 @@ function upgrade2ultimate
echo "This question is about general desktop applications."
echo "It contains apps such as Telegram, Nextcloud-client & Syncthing."
echo "Are these going to be installed? (y,n)"
read gaming
if [ $gaming = "y" ]; then
echo "sudo pacman -Syu --noconfirm --needed telegram-desktop joplin murmur mumble discord streamlink-twitch-gui syncthing-gtk nextcloud-client firefox-extension-bitwarden fractal firefox-extension-xdm-browser-monitor" >> /tmp/setup-assistant/install-packages.sh
read general
if [ $general = "y" ]; then
echo "telegram-desktop
joplin
murmur
mumble
discord
streamlink-twitch-gui
syncthing-gtk
nextcloud-client
firefox-extension-bitwarden
fractal
firefox-extension-xdm-browser-monitor" >> /tmp/setup-assistant/pkgs.txt
fi
: virt-selection
@ -109,19 +139,24 @@ function upgrade2ultimate
echo "2) Id rather choose Virt-manager."
read virt
if [ $virt = "1" ]; then
echo "sudo pacman -Syu garuda-virtualbox" >> /tmp/setup-assistant/install-packages.sh
echo "usermod -aG vboxusers $user" >> /tmp/setup-assistant/install-packages.sh
echo "garuda-virtualbox" >> /tmp/setup-assistant/pkgs.txt
echo "usermod -aG vboxusers $USER" >> /tmp/setup-assistant/setup.sh
elif [ $virt = "2" ]; then
echo "sudo pacman -Syu garuda-virt-manager" >> /tmp/setup-assistant/install-packages.sh
echo "sudo systemctl enable --now libvirtd" >> /tmp/setup-assistant/install-packages.sh
echo "usermod -aG libvirt $user" >> /tmp/setup-assistant/install-packages.sh
echo "usermod -aG kvm $user" >> /tmp/setup-assistant/install-packages.sh
echo "garuda-virt-manager" >> /tmp/setup-assistant/pkgs.txt
echo "sudo systemctl enable --now libvirtd" >> /tmp/setup-assistant/setup.sh
echo "usermod -aG libvirt $USER" >> /tmp/setup-assistant/setup.sh
echo "usermod -aG kvm $USER" >> /tmp/setup-assistant/setup.sh
else echo "Thats not a valid choice! ❌"
goto "virt-selection"
fi
clear
sudo sh /tmp/setup-assistant/install-packages.sh
sudo sh /tmp/setup-assistant/prepare.sh
cat /tmp/setup-assistant/pkgs.txt | sed '/^$/d;s/[[:blank:]]//g' > /tmp/setup-assistant/pkgs-install.txt
sudo pacman --needed -S - < /tmp/setup-assistant/pkgs-install.txt
sudo sh /tmp/setup-assistant/setup.sh
rm -rf /tmp/setup-assistant
}
systemctl --user enable psd >/dev/null 2>&1 &