add printing option to setup-assistant

usr/bin/setup-assistant

@@ -14,10 +14,35 @@ function upgrade2ultimate
         --button=Yes:1 \
         --text-align=center \
         --center \
-        --text "Do you need noto-fonts-cjk font support (fixes missing characters)?"; then
+        --text "Do you need cjk font support (fixes missing characters)?"; then
             echo "noto-fonts-cjk" >> /tmp/setup-assistant/pkgs.txt
     fi
 
+    if ! yad \
+        --image='printer' \
+        --title="Upgrade to ULTIMATE" \
+        --window-icon='update' \
+        --geometry=700x100 \
+        --button=No:0 \
+        --button=Yes:1 \
+        --text-align=center \
+        --center \
+        --text "Do you need Printer,Scanner and Samba Support?"; then
+            if pacman -Qs plasma-workspace > /dev/null ; then
+            echo "printer-support
+            scanner-support
+            samba-support
+            kdenetwork-filesharing
+            print-manager
+            skanlite" >> /tmp/setup-assistant/pkgs.txt
+            else
+            echo "printer-support
+            scanner-support
+            samba-support
+            gvfs-samba
+            simple-scan" >> /tmp/setup-assistant/pkgs.txt
+            fi
+    fi
 
     if ! yad \
         --image='wallpaper' \
@@ -199,6 +224,10 @@ function upgrade2ultimate
     if grep -R "Chromium" /tmp/setup-assistant/browsers.txt; then
         echo "chromium" >> /tmp/setup-assistant/pkgs.txt
     fi
+    if grep -R "Vivaldi" /tmp/setup-assistant/browsers.txt; then
+        echo "vivaldi
+        vivaldi-ffmpeg-codecs" >> /tmp/setup-assistant/pkgs.txt
+    fi
     if grep -R "Opera" /tmp/setup-assistant/browsers.txt; then
         echo "opera
         opera-ffmpeg-codecs" >> /tmp/setup-assistant/pkgs.txt
@@ -259,6 +288,9 @@ function upgrade2ultimate
     if grep -R "Deluge" /tmp/setup-assistant/internet.txt; then
         echo "deluge-gtk" >> /tmp/setup-assistant/pkgs.txt
     fi
+    if grep -R "Qbittorrent" /tmp/setup-assistant/internet.txt; then
+        echo "qbittorrent" >> /tmp/setup-assistant/pkgs.txt
+    fi
     if grep -R "Cockpit" /tmp/setup-assistant/internet.txt; then
         echo "cockpit
         cockpit-dashboard
@@ -420,17 +452,6 @@ function upgrade2ultimate
         opus-tools
         frei0r-plugins" >> /tmp/setup-assistant/pkgs.txt
     fi
-    if grep -R "Baka-Mplayer" /tmp/setup-assistant/video.txt; then
-        echo "baka-mplayer" >> /tmp/setup-assistant/pkgs.txt
-    fi
-    if grep -R "OBS Studio" /tmp/setup-assistant/video.txt; then
-        echo "obs-studio" >> /tmp/setup-assistant/pkgs.txt
-    fi
-    if grep -R "SMPlayer" /tmp/setup-assistant/video.txt; then
-        echo "smplayer
-        smplayer-skins
-        smplayer-themes" >> /tmp/setup-assistant/pkgs.txt
-    fi
     if grep -R "Shotcut" /tmp/setup-assistant/video.txt; then
         echo "shotcut" >> /tmp/setup-assistant/pkgs.txt
     fi
@@ -438,6 +459,25 @@ function upgrade2ultimate
         echo "pitivi
         frei0r-plugins" >> /tmp/setup-assistant/pkgs.txt
     fi
+    if grep -R "Openshot" /tmp/setup-assistant/video.txt; then
+        echo "openshot" >> /tmp/setup-assistant/pkgs.txt
+    fi
+    if grep -R "OBS Studio" /tmp/setup-assistant/video.txt; then
+        echo "obs-studio" >> /tmp/setup-assistant/pkgs.txt
+    fi
+
+    if grep -R "SMPlayer" /tmp/setup-assistant/video.txt; then
+        echo "smplayer
+        smplayer-skins
+        smplayer-themes" >> /tmp/setup-assistant/pkgs.txt
+    fi
+    if grep -R "Vlc" /tmp/setup-assistant/video.txt; then
+        echo "vlc" >> /tmp/setup-assistant/pkgs.txt
+    fi
+    if grep -R "Baka-Mplayer" /tmp/setup-assistant/video.txt; then
+        echo "baka-mplayer" >> /tmp/setup-assistant/pkgs.txt
+    fi
+
 
 
    yad \
@@ -540,6 +580,12 @@ function upgrade2ultimate
         vcdimager
         cdrtools" >> /tmp/setup-assistant/pkgs.txt
     fi
+    if grep -R "BRASERO" /tmp/setup-assistant/multimedia.txt; then
+        echo "brasero" >> /tmp/setup-assistant/pkgs.txt
+    fi 
+    if grep -R "XFBURN" /tmp/setup-assistant/multimedia.txt; then
+        echo "xfburn" >> /tmp/setup-assistant/pkgs.txt
+    fi 
     if grep -R "Easytag" /tmp/setup-assistant/multimedia.txt; then
         echo "easytag" >> /tmp/setup-assistant/pkgs.txt
     fi   
@@ -549,8 +595,11 @@ function upgrade2ultimate
     if grep -R "Handbrake" /tmp/setup-assistant/multimedia.txt; then
         echo "handbrake" >> /tmp/setup-assistant/pkgs.txt
     fi
-    if grep -R "Qwinff" /tmp/setup-assistant/multimedia.txt; then
+    if grep -R "Mystiq" /tmp/setup-assistant/multimedia.txt; then
-        echo "qwinff" >> /tmp/setup-assistant/pkgs.txt
+        echo "mystiq" >> /tmp/setup-assistant/pkgs.txt
+    fi
+    if grep -R "Hypnotix" /tmp/setup-assistant/multimedia.txt; then
+        echo "hypnotix" >> /tmp/setup-assistant/pkgs.txt
     fi
     if grep -R "Variety" /tmp/setup-assistant/multimedia.txt; then
         echo "variety" >> /tmp/setup-assistant/pkgs.txt
@@ -611,6 +660,7 @@ function upgrade2ultimate
         chmod +x strap.sh
         sudo ./strap.sh
         rm strap.sh
+        sed -i 's/^# Server/Server/' /etc/pacman.d/blackarch-mirrorlist
         sudo pacman -Syu" >> /tmp/setup-assistant/setup_root.sh
     fi
 

usr/lib/setup-assistant/browsers.txt

@@ -3,6 +3,8 @@ Firefox (recommended)
 false
 Chromium
 false
+Vivaldi
+false
 Opera
 false
 Tor Browser (The Onion Router)

usr/lib/setup-assistant/internet.txt

@@ -23,6 +23,8 @@ Jdownloader2 (Advanced download manager)
 false
 Deluge (GTK torrent client)
 false
+Qbittorrent (QT torrent client)
+false
 Twitch GUI
 false
-None of them
+None of them

usr/lib/setup-assistant/multimedia.txt

@@ -1,32 +1,38 @@
 false
+Converseen (Image converter)
+false
+Handbrake (Video format transcoder)
+false
+Mystiq (QT Video converter)
+false
+Transmageddon (GTK Video converter)
+false
+Soundkonvertor (Audio converter)
+false
 Stremio (One-stop hub for video content aggregation)
 false
 Kodi (Entertainment hub)
 false
 Mediaelch (Media manager for Kodi)
 false
+Plex desktop client
+false
+Hypnotix (An IPTV app for watching live tv)
+false
 Subtitlecomposer (A KDE subtitle editor)
 false
 Kid3 (KDE Tag editor)
 false
 Easytag (Audio tag editor)
 false
-Plex desktop client
+K3B (CD burning application for KDE)
 false
-K3B (CD burning application)
+BRASERO (CD burning application for GTK)
 false
-Qwinff (Video converter)
+XFBURN (CD burning application for XFCE)
-false
-Transmageddon (Video converter)
-false
-Soundkonvertor (Audio converter)
-false
-Converseen (Image converter)
-false
-Handbrake (Video format transcoder)
 false
 Variety (Wallpaper changer)
 false
 Conky (System monitor)
 false
-None of them
+None of them

usr/lib/setup-assistant/video.txt

@@ -1,16 +1,18 @@
 true
 Kdenlive (Video editor by KDE)
 false
-Baka-Mplayer (libmpv and Qt based video player)
-false
-OBS Studio (Video recording/streaming)
-false
-SMPlayer (Build-in codecs, high compatability video player)
-false
 Shotcut (Qt-based video editor)
 false
 Pitivi
 false
 Openshot
 false
+OBS Studio (Video recording/streaming)
+false
+SMPlayer (Build-in codecs, high compatability video player)
+false
+Vlc 
+false
+Baka-Mplayer (libmpv and Qt based video player)
+false
 None of them