Merge pull request 'adjustments-for-linux-mint-20' (#31) from adjustments-for-linux-mint-20 into master

Reviewed-on: https://codeberg.org/Computertruhe/Setup-Skripte/pulls/31
Reviewed-by: stefan230 <stefan230@noreply.codeberg.org>

mint/linux_mint.sh

@@ -10,15 +10,14 @@ export DEBIAN_FRONTEND=noninteractive
 DPKG_CFG_FRAGMENT=/etc/dpkg/dpkg.cfg.d/non-interactive
 
 # Linux distro
-script_distro='Linux Mint 19.x'
+script_distro='Linux Mint 20'
 
 # Additional packages
 packages=(
   # Graphics
-  cheese
+  gimp
   inkscape
   pinta
-  gimp
 
   # Office
   libreoffice
@@ -62,21 +61,52 @@ packages=(
 
   # Tools
   hardinfo
-  shutter
   vim
 
-  # Management
-  calibre
-
   # Media
+  cheese
   vlc
 
-  # Knowledge
+  # Knowledge (incl. programs from the former ubunbu-edu-* meta packages)
+  blinken
+  calibre
+  cantor
+  chemtool
+  dia
+  einstein
+  fritzing
+  gamine
+  gcompris
   goldendict
-  ubuntu-edu-preschool
-  ubuntu-edu-primary
-  ubuntu-edu-secondary
-  ubuntu-edu-tertiary
+  inkscape
+  kalgebra
+  kalzium
+  kanagram
+  kbruch
+  kgeography
+  khangman
+  kig
+  klettres
+  kmplot
+  kstars
+  ktouch
+  ktuberling
+  kturtle
+  kwordquiz
+  laby
+  lightspeed
+  lybniz
+  marble
+  melting
+  parley
+  pencil2d
+  ri-li
+  rocs
+  step
+  tuxmath
+  tuxpaint
+  tuxtype
+  yorick
 
   # Language support
   language-selector-common
@@ -99,13 +129,13 @@ e() {
 # It's a pain to stop (ctrl+c, kill) execution with all the Python applications
 # so we catch SIGINT and SIGTERM and exit immediately
 handle_signal() {
-  e "Ausführung abgebrochen! Script wird beendet..."
+  e "Ausführung abgebrochen! Skript wird beendet."
   exit 1
 }
 
 # always executed on shell exit regardless of reason. for cleanup tasks
 handle_exit() {
-  e "Finales Cleanup wird durchgeführt..."
+  e "Finales Cleanup wird durchgeführt …"
   rm -f "$DPKG_CFG_FRAGMENT"
 }
 
@@ -127,12 +157,12 @@ echo "\
 ###
 # Maintainer: Computertruhe e. V.
 # Website:    https://computertruhe.de/
-# Version:    0.2.0
+# Version:    1.0.0
 # Repo:       https://codeberg.org/Computertruhe/computertruhe-setup
 # Distro:     ${script_distro}
 ###
 "
-e "Starte initiales Setup für Rechner mit frisch installiertem '${script_distro}' ..."
+e "Starte initiales Setup für Rechner mit frisch installiertem '${script_distro}' …"
 
 ###
 # Automatic installation
@@ -143,39 +173,42 @@ force-confold
 force-confdef
 DPKG
 
-e "Automatische Installation empfohlener Pakete aktivieren ..."
-sed -i 's/false/true/g' /etc/apt/apt.conf.d/00recommends
+e "Automatische Installation empfohlener Pakete aktivieren …"
+cat <<'EOF' > /etc/apt/apt.conf.d/00recommends
+APT::Install-Recommends "true";
+Aptitude::Recommends-Important "true";
+EOF
 
-e "Besten Spiegelserver für '${script_distro}' auswählen ..."
+e "Besten Spiegelserver für '${script_distro}' auswählen …"
 mint-switch-to-local-mirror
 
-e "Paketquellen aktualisieren ..."
+e "Paketquellen aktualisieren …"
 apt update --yes --quiet
 
-e "System aktualisieren (apt) ..."
+e "System aktualisieren (apt) …"
 apt full-upgrade --yes --quiet
 
-e "System aktualisieren (mintupdate-cli) ..."
+e "System aktualisieren (mintupdate-cli) …"
 mintupdate-cli --yes upgrade
 
-e "Proprietäre Treiber installieren (sofern verfügbar) ..."
+e "Proprietäre Treiber installieren (sofern verfügbar) …"
 ubuntu-drivers autoinstall
 
-e "Zusätzliche Software installieren ..."
+e "Zusätzliche Software installieren …"
 pkg "${packages[@]}"
 
-e "Sprachunterstützung vervollständigen ..."
+e "Sprachunterstützung vervollständigen …"
 pkg "$(check-language-support)"
 # these packages have to be installed after "$(check-language-support)"
 pkg hunspell-de-at hunspell-de-ch hunspell-de-de
 
-e "Unnötige Pakete entfernen und Cache bereinigen ..."
+e "Unnötige Pakete entfernen und Cache bereinigen …"
 apt clean --yes --quiet
 apt autoremove --yes --quiet
 
 # https://askubuntu.com/questions/1037553/how-to-configure-a-dconf-key-globally-across-all-user-accounts#1037557
 # https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/desktop_migration_and_administration_guide/custom-default-values-system-settings
-e "Tastatur- und Desktopoptionen werden angepasst"
+e "Tastatur- und Desktop-Optionen anpassen …"
 mkdir -vp /etc/dconf/{profile,db/local.d}
 
 cat <<'EOF' > /etc/dconf/profile/user