From 75d8b1cd8cb6168351bbb95c86c29b093f2a5fa3 Mon Sep 17 00:00:00 2001 From: Nico Jensch Date: Sun, 15 Nov 2020 16:20:59 +0100 Subject: [PATCH] Fix some string issues, changed icon & psd active for chromium & firefox --- etc/skel/.config/psd/psd.conf | 2 +- usr/bin/setup-assistant | 37 +++++++++---------- usr/lib/setup-assistant/video.txt | 2 +- .../applications/setup-assistant.desktop | 2 +- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/etc/skel/.config/psd/psd.conf b/etc/skel/.config/psd/psd.conf index 1977279..6805073 100644 --- a/etc/skel/.config/psd/psd.conf +++ b/etc/skel/.config/psd/psd.conf @@ -52,7 +52,7 @@ # vivaldi # vivaldi-snapshot # -#BROWSERS=() +BROWSERS=(firefox chromium) # Uncomment and set to "no" to completely disable the crash recovery feature. # diff --git a/usr/bin/setup-assistant b/usr/bin/setup-assistant index 859f105..401b4a3 100755 --- a/usr/bin/setup-assistant +++ b/usr/bin/setup-assistant @@ -7,7 +7,7 @@ function upgrade2ultimate clear if ! yad \ --image='font-manager' \ - --title="Upgrade to ULTIMATE 👾" \ + --title="Upgrade to ULTIMATE" \ --window-icon='update' \ --geometry=700x100 \ --button=No:0 \ @@ -20,7 +20,7 @@ function upgrade2ultimate if ! yad \ --image='AppImageLauncher' \ - --title="Upgrade to ULTIMATE 👾" \ + --title="Upgrade to ULTIMATE" \ --window-icon='update' \ --geometry=700x100 \ --button=No:0 \ @@ -46,7 +46,7 @@ function upgrade2ultimate if pacman -Qs plasma-desktop > /dev/null ; then if ! yad \ --image='plasmashell' \ - --title="Upgrade to ULTIMATE 👾" \ + --title="Upgrade to ULTIMATE" \ --window-icon='update' \ --geometry=700x100 \ --button=No:0 \ @@ -79,7 +79,7 @@ function upgrade2ultimate if pacman -Qs gnome-shell > /dev/null ; then if ! yad \ --image='gnome-shell' \ - --title="Upgrade to ULTIMATE 👾" \ + --title="Upgrade to ULTIMATE" \ --window-icon='update' \ --geometry=700x100 \ --button=No:0 \ @@ -105,7 +105,7 @@ function upgrade2ultimate yad \ --image='libreoffice-main' \ - --title="Upgrade to ULTIMATE 👾" \ + --title="Upgrade to ULTIMATE" \ --window-icon='update' \ --text "There are a lot of office suites to choose from!" \ --geometry=600x400 \ @@ -153,7 +153,7 @@ function upgrade2ultimate yad \ --image='firefox' \ - --title="Upgrade to ULTIMATE 👾" \ + --title="Upgrade to ULTIMATE" \ --window-icon='update' \ --text "Here are some browsers that you can choose from:" \ --geometry=600x400 \ @@ -189,7 +189,7 @@ function upgrade2ultimate yad \ --image='nextcloud-client' \ - --title="Upgrade to ULTIMATE 👾" \ + --title="Upgrade to ULTIMATE" \ --window-icon='update' \ --text "Some general internet applications?" \ --geometry=600x400 \ @@ -242,7 +242,7 @@ function upgrade2ultimate yad \ --image='telegram-desktop' \ - --title="Upgrade to ULTIMATE 👾" \ + --title="Upgrade to ULTIMATE" \ --window-icon='update' \ --text "Do you need communication software?" \ --geometry=600x400 \ @@ -289,7 +289,7 @@ function upgrade2ultimate yad \ --image='thunderbird' \ - --title="Upgrade to ULTIMATE 👾" \ + --title="Upgrade to ULTIMATE" \ --window-icon='update' \ --text "Mail clients:" \ --geometry=600x400 \ @@ -318,7 +318,7 @@ function upgrade2ultimate yad \ --image='audacity' \ - --title="Upgrade to ULTIMATE 👾" \ + --title="Upgrade to ULTIMATE" \ --window-icon='update' \ --text "What about audio software?" \ --geometry=600x400 \ @@ -370,7 +370,7 @@ function upgrade2ultimate yad \ --image='kdenlive' \ - --title="Upgrade to ULTIMATE 👾" \ + --title="Upgrade to ULTIMATE" \ --window-icon='update' \ --text "What about video software?" \ --geometry=600x400 \ @@ -384,7 +384,6 @@ function upgrade2ultimate echo "kdenlive movit sox - laspa opus-tools frei0r-plugins" >> /tmp/setup-assistant/pkgs.txt fi @@ -410,7 +409,7 @@ function upgrade2ultimate yad \ --image='gimp' \ - --title="Upgrade to ULTIMATE 👾" \ + --title="Upgrade to ULTIMATE" \ --window-icon='update' \ --text "What about graphics software?" \ --geometry=600x400 \ @@ -462,7 +461,7 @@ function upgrade2ultimate yad \ --image='kodi' \ - --title="Upgrade to ULTIMATE 👾" \ + --title="Upgrade to ULTIMATE" \ --window-icon='update' \ --text "What about multimedia software?" \ --geometry=600x400 \ @@ -529,7 +528,7 @@ function upgrade2ultimate yad \ --image='code' \ - --title="Upgrade to ULTIMATE 👾" \ + --title="Upgrade to ULTIMATE" \ --window-icon='update' \ --text "Are you a developer who needs one of these?" \ --geometry=600x400 \ @@ -560,7 +559,7 @@ function upgrade2ultimate yad \ --image='virtualbox' \ - --title="Upgrade to ULTIMATE 👾" \ + --title="Upgrade to ULTIMATE" \ --window-icon='update' \ --text "Are you rather a fan of Virtualbox or virt-manager?" \ --geometry=600x400 \ @@ -604,7 +603,7 @@ if ! yad \ --button=Yes:1 \ --text-align=center \ --center \ - --text "Do you want to get a recent mirrorlist and refresh mirrors?" 💻; then + --text "Do you want to get a recent mirrorlist and refresh mirrors?"; then reflector-simple >/dev/null 2>&1 fi @@ -617,7 +616,7 @@ if ! yad \ --button=Yes:1 \ --text-align=center \ --center \ - --text "Update the system? (recommended!) 😊"; then + --text "Update the system? (recommended!)"; then alacritty -e sudo pacman "-Syyu" fi @@ -630,7 +629,7 @@ if ! yad \ --button=Yes:1 \ --text-align=center \ --center \ - --text "Upgrade to Ultimate? (You can select which apps you want!) 🔧"; then + --text "Upgrade to Ultimate? (You can select which apps you want!)"; then upgrade2ultimate fi diff --git a/usr/lib/setup-assistant/video.txt b/usr/lib/setup-assistant/video.txt index 7670d03..afe58a3 100644 --- a/usr/lib/setup-assistant/video.txt +++ b/usr/lib/setup-assistant/video.txt @@ -1,7 +1,7 @@ true Kdenlive (Video editor by KDE) false -Baka-Mplayer (libmpv & Qt based video player) +Baka-Mplayer (libmpv and Qt based video player) false OBS Studio (Video recording/streaming) false diff --git a/usr/share/applications/setup-assistant.desktop b/usr/share/applications/setup-assistant.desktop index 968c36c..9f70cfd 100755 --- a/usr/share/applications/setup-assistant.desktop +++ b/usr/share/applications/setup-assistant.desktop @@ -7,6 +7,6 @@ Encoding=UTF-8 Exec=setup-assistant Terminal=false Type=Application -Icon=pamac-updater +Icon=gnome-system-log Categories=GTK;System;Garuda-Setup; NoDisplay=false