From 0ed806753b2569dcab5b05885cf12a3aa74d2e30 Mon Sep 17 00:00:00 2001
From: Matthias Lisin <lisin@strato.de>
Date: Sat, 11 Jan 2020 00:51:36 +0100
Subject: [PATCH] Rename more_packages to packages.

Move some language packages to packages list.
Revert apt-get to apt.
Add info about install order
---
 linux_mint.sh | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/linux_mint.sh b/linux_mint.sh
index 36ee598..617d5ab 100755
--- a/linux_mint.sh
+++ b/linux_mint.sh
@@ -12,7 +12,7 @@ color_prefix=32 # green
 script_distro='Linux Mint 19.x'
 
 # Additional packages
-more_packages=(
+packages=(
   # Graphics
   cheese
   inkscape
@@ -71,6 +71,14 @@ more_packages=(
   ubuntu-edu-primary
   ubuntu-edu-secondary
   ubuntu-edu-tertiary
+
+  # Language support
+  language-selector-common
+  openoffice.org-hyphenation
+  language-pack-ar
+  language-pack-gnome-ar
+  language-pack-fa
+  language-pack-gnome-fa
 )
 
 ###
@@ -94,7 +102,7 @@ handle_signal() {
 trap handle_signal SIGINT SIGTERM
 
 pkg() {
-  apt-get install "$@" --quiet --yes
+  apt install "$@" --quiet --yes
 }
 
 ###
@@ -127,21 +135,19 @@ if is_root; then
   ubuntu-drivers autoinstall
 
   e "Zusätzliche Software installieren ..."
-  pkg "${more_packages[@]}"
-
-  e "Sprachpakete 'ar' und 'fa' installieren ..."
-  pkg language-pack-ar language-pack-gnome-ar language-pack-fa language-pack-gnome-fa
+  pkg "${packages[@]}"
 
   e "Sprachunterstützung vervollständigen ..."
-  pkg language-selector-common "$(check-language-support)"
-  pkg hunspell-de-at hunspell-de-ch hunspell-de-de openoffice.org-hyphenation
+  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 ..."
   apt clean --yes --quiet
   apt autoremove --yes --quiet
 
   e "Root Setup abgeschlossen."
-  # It's very important to exit here. We don't want to have run as root past this point
+  # It's very important to exit here. We don't want root past this point!
   exit
 fi