5
0
Fork 0
mirror of https://codeberg.org/Computertruhe/Setup-Skripte.git synced 2025-06-28 03:16:21 +02:00

Merge pull request 'aptproxy, pakete konsolidiert' (#80) from auto-apt-proxy_dabei into main

Reviewed-on: https://codeberg.org/Computertruhe/Setup-Skripte/pulls/80
Reviewed-by: Agent_K <agent_k@noreply.codeberg.org>
This commit is contained in:
B3rtl 2024-11-03 11:57:08 +00:00
commit 45a710a5a7
2 changed files with 55 additions and 25 deletions

View file

@ -17,7 +17,7 @@ packages=(
libreoffice libreoffice
keepassxc keepassxc
kpartx kpartx
oem-config # oem-config
hardinfo hardinfo
regionset regionset
cheese cheese
@ -26,10 +26,52 @@ packages=(
# Language support # Language support
language-selector-common language-selector-common
openoffice.org-hyphenation openoffice.org-hyphenation
# AR
language-pack-kde-ar language-pack-kde-ar
language-pack-kde-uk fonts-arabeyes
language-pack-kde-ru hunspell-ar
libreoffice-l10n-ar
mythes-ar
hunspell-ar
thunderbird-locale-ar
# DE
language-pack-kde-de # Installed only with Internet connection during the OEM setup.
firefox-locale-de
thunderbird-locale-de # Installed only with Internet connection during the OEM setup.
hunspell-de-de
mythes-de
hyphen-de
mythes-de
# EN
thunderbird-locale-en-gb
# FA
language-pack-kde-fa language-pack-kde-fa
firefox-locale-fa
thunderbird-locale-fa
libreoffice-l10n-fa
myspell-fa
# RU
language-pack-kde-ru
firefox-locale-ru
thunderbird-locale-ru
hyphen-ru
mythes-ru
hunspell-ru
# UK
language-pack-kde-uk
libreoffice-l10n-uk
firefox-locale-uk
thunderbird-locale-uk
hyphen-uk
mythes-uk
hunspell-uk
wukrainian
) )
### ###
@ -80,17 +122,11 @@ 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}' …"
# ChCh apt proxy benutzen (bedingt = wenn da) # Generell auto-apt-proxy installieren
ping -c 1 apt-proxy # tut nicht weh und erweitert apt jetzt und in Zukunft, einen host apt-proxy oder andere
if [ "$?" -eq "0" ]; then # z.b. in SRV-Records benannte caches zu verwenden. gut für spätere updates.
echo 'Acquire::https::Proxy "http://apt-proxy:3142";' > /etc/apt/apt.conf.d/01aptproxy e "Apt proxy automatisch verwenden"
echo 'Acquire::http::Proxy "http://apt-proxy:3142";' >> /etc/apt/apt.conf.d/01aptproxy apt install auto-apt-proxy
e "Proxy Apt-Aktiv"
else
e "Kein Apt-Proxy"
fi
echo 'Dpkg::Options "--force-unsafe-io";' >> /etc/apt/apt.conf.d/01aptproxy
### ###
# Automatic installation # Automatic installation

View file

@ -114,17 +114,11 @@ 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. # Generell auto-apt-proxy installieren
ping -c 1 apt-proxy > /dev/null 2>&1 # tut nicht weh und erweitert apt jetzt und in Zukunft, einen host apt-proxy oder andere
if [ "$?" -eq "0" ]; then # z.b. in SRV-Records benannte caches zu verwenden. gut für spätere updates.
e "Nutze APT-Proxy." e "Apt proxy automatisch verwenden"
echo 'Acquire::https::Proxy "http://apt-proxy:3142";' > /etc/apt/apt.conf.d/01aptproxy apt install auto-apt-proxy
echo 'Acquire::http::Proxy "http://apt-proxy:3142";' >> /etc/apt/apt.conf.d/01aptproxy
else
e "Kein APT-Proxy gefunden."
fi
echo 'Dpkg::Options "--force-unsafe-io";' >> /etc/apt/apt.conf.d/01aptproxy
### ###
# Automatic installation # Automatic installation