Merge branch 'main' into skripte-f-install

This commit is contained in:
B3rtl 2023-09-25 18:32:07 +00:00
commit c63f56a982
1 changed files with 9 additions and 8 deletions

View File

@ -9,8 +9,8 @@
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
DPKG_CFG_FRAGMENT=/etc/dpkg/dpkg.cfg.d/non-interactive DPKG_CFG_FRAGMENT=/etc/dpkg/dpkg.cfg.d/non-interactive
# Linux distro # Name of the distribution
script_distro='Linux Mint 21.1' script_distro='Linux Mint 21.2'
# Additional packages # Additional packages
packages=( packages=(
@ -35,10 +35,12 @@ packages=(
mythes-ar mythes-ar
thunderbird-locale-ar thunderbird-locale-ar
# DE # DE
language-pack-gnome-de-base # Installed only with Internet connection during the OEM setup.
firefox-locale-de firefox-locale-de
hunspell-de-at hunspell-de-at
hunspell-de-ch hunspell-de-ch
hunspell-de-de hunspell-de-de
thunderbird-locale-de # Installed only with Internet connection during the OEM setup.
# EN # EN
thunderbird-locale-en-gb thunderbird-locale-en-gb
# FA # FA
@ -68,11 +70,10 @@ packages=(
# $*: message to echo. # $*: message to echo.
e() { e() {
printf "\e[31m>>>\e[0m %s\n" "$*" printf "\e[32m>>>\e[0m %s\n" "$*"
} }
# It's a pain to stop execution (CTRL+C, kill) with all the Python applications # It's a pain to stop execution (CTRL+C, kill) with all the Python applications so we catch SIGINT and SIGTERM and exit immediately.
# so we catch SIGINT and SIGTERM and exit immediately.
handle_signal() { handle_signal() {
e "Ausführung abgebrochen! Skript wird beendet." e "Ausführung abgebrochen! Skript wird beendet."
exit 1 exit 1
@ -105,7 +106,7 @@ echo "\
### ###
# Maintainer: Computertruhe e. V. # Maintainer: Computertruhe e. V.
# Website: https://computertruhe.de/ # Website: https://computertruhe.de/
# Version: 2.3.0 # Version: 2.3.1
# Repo: https://codeberg.org/Computertruhe/Setup-Skripte # Repo: https://codeberg.org/Computertruhe/Setup-Skripte
# Distro: ${script_distro} # Distro: ${script_distro}
### ###
@ -113,7 +114,7 @@ echo "\
e "Starte initiales Setup für Rechner mit frisch installiertem '${script_distro}' …" e "Starte initiales Setup für Rechner mit frisch installiertem '${script_distro}' …"
# Use APT proxy if available. # Use APT proxy if available.
ping -c 1 apt-proxy ping -c 1 apt-proxy > /dev/null 2>&1
if [ "$?" -eq "0" ]; then if [ "$?" -eq "0" ]; then
e "Nutze APT-Proxy." e "Nutze APT-Proxy."
echo 'Acquire::https::Proxy "http://apt-proxy:3142";' > /etc/apt/apt.conf.d/01aptproxy echo 'Acquire::https::Proxy "http://apt-proxy:3142";' > /etc/apt/apt.conf.d/01aptproxy
@ -146,7 +147,7 @@ e "Proprietäre Treiber installieren (sofern verfügbar) …"
ubuntu-drivers autoinstall ubuntu-drivers autoinstall
e "Multimedia-Codecs installieren …" e "Multimedia-Codecs installieren …"
pkg mint-meta-codecs pkg mint-meta-codecs # Installed only with Internet connection during the OEM setup.
e "Zusätzliche Software installieren …" e "Zusätzliche Software installieren …"
pkg "${packages[@]}" pkg "${packages[@]}"