fix setup-assistant

This commit is contained in:
Librewish 2020-12-10 12:15:57 +05:30
parent 24517c43ce
commit 2d2120bcb5
2 changed files with 10 additions and 7 deletions

View File

@ -43,7 +43,12 @@ function upgrade2ultimate
--text-align=center \
--center \
--text "What about Snaps, Flatpak, Appimage and firmware update support?"; then
echo "sudo pacman --noconfirm -R pamac-aur pamac-tray-appindicator" >> /tmp/setup-assistant/prepare.sh
if pacman -Qs pamac-aur > /dev/null ; then
echo "sudo pacman --noconfirm -R pamac-aur" >> /tmp/setup-assistant/prepare.sh
fi
if pacman -Qs pamac-tray-appindicator > /dev/null ; then
echo "sudo pacman --noconfirm -R pamac-tray-appindicator" >> /tmp/setup-assistant/prepare.sh
fi
echo "pamac-all
appimagelauncher
fwupd
@ -173,7 +178,7 @@ function upgrade2ultimate
echo "abiword" >> /tmp/setup-assistant/pkgs.txt
fi
if grep -R "Joplin" /tmp/setup-assistant/office.txt; then
echo "joplin" >> /tmp/setup-assistant/pkgs.txt
echo "joplin-desktop-electron" >> /tmp/setup-assistant/pkgs.txt
fi
yad \
@ -429,8 +434,8 @@ function upgrade2ultimate
if grep -R "Shotcut" /tmp/setup-assistant/video.txt; then
echo "shotcut" >> /tmp/setup-assistant/pkgs.txt
fi
if grep -R "Piviti" /tmp/setup-assistant/video.txt; then
echo "piviti
if grep -R "Pitivi" /tmp/setup-assistant/video.txt; then
echo "pitivi
frei0r-plugins" >> /tmp/setup-assistant/pkgs.txt
fi
@ -527,8 +532,6 @@ function upgrade2ultimate
fi
if grep -R "K3B" /tmp/setup-assistant/multimedia.txt; then
echo "k3b
kaudiocreator
cdpara
cdparanoia
cdrdao
dvd+rw-tools

View File

@ -9,7 +9,7 @@ SMPlayer (Build-in codecs, high compatability video player)
false
Shotcut (Qt-based video editor)
false
Piviti
Pitivi
false
Openshot
false