Изменена логика исправления
This commit is contained in:
22
install.sh
22
install.sh
@@ -438,6 +438,17 @@ proceed_with_installation() {
|
||||
fi
|
||||
log_success "Старые пакеты удалены"
|
||||
|
||||
if [ "$DISTRO" = "fedora" ]; then
|
||||
log_step "Исправление проблем с репозиториями..."
|
||||
$PKG_MANAGER config-manager --set-disabled fedora-cisco-openh264 >/dev/null 2>&1
|
||||
|
||||
grep -q "nameserver 8.8.8.8" /etc/resolv.conf || echo "nameserver 8.8.8.8" >> /etc/resolv.conf
|
||||
grep -q "nameserver 1.1.1.1" /etc/resolv.conf || echo "nameserver 1.1.1.1" >> /etc/resolv.conf
|
||||
|
||||
$PKG_MANAGER clean all >/dev/null 2>&1
|
||||
$PKG_MANAGER makecache >/dev/null 2>&1
|
||||
fi
|
||||
|
||||
log_step "Обновление списка пакетов..."
|
||||
if [ "$DISTRO_FAMILY" = "debian" ]; then
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
@@ -525,17 +536,6 @@ proceed_with_installation() {
|
||||
|
||||
log_success "MariaDB установлен и запущен"
|
||||
|
||||
if [ "$DISTRO" = "fedora" ]; then
|
||||
log_step "Исправление проблем с репозиториями..."
|
||||
$PKG_MANAGER config-manager --set-disabled fedora-cisco-openh264 >/dev/null 2>&1
|
||||
|
||||
grep -q "nameserver 8.8.8.8" /etc/resolv.conf || echo "nameserver 8.8.8.8" >> /etc/resolv.conf
|
||||
grep -q "nameserver 1.1.1.1" /etc/resolv.conf || echo "nameserver 1.1.1.1" >> /etc/resolv.conf
|
||||
|
||||
$PKG_MANAGER clean all >/dev/null 2>&1
|
||||
$PKG_MANAGER makecache >/dev/null 2>&1
|
||||
fi
|
||||
|
||||
log_step "Установка дополнительных компонентов (Redis, LibreOffice)..."
|
||||
if [ "$DISTRO_FAMILY" = "debian" ]; then
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
Reference in New Issue
Block a user