EngineGP/Autoinstall
1
0
Fork 0
mirror of https://github.com/EngineGPDev/Autoinstall.git synced 2024-10-15 08:58:01 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed duplicate repository addition in ubuntu (#57)

Browse Source 
Fixed duplicate repository addition in ubuntu
This commit is contained in:
Sergei Solovev 2024-10-01 20:30:49 +03:00 committed by GitHub
parent 50f23978bf
commit 61ad549555
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
install.sh
View File

@ -45,6 +45,7 @@ done
# Массив с поддерживаемыми версиями операционной системы # Массив с поддерживаемыми версиями операционной системы
suppOs=("Debian 11" "Debian 12" "Ubuntu 22.04" "Ubuntu 24.04") suppOs=("Debian 11" "Debian 12" "Ubuntu 22.04" "Ubuntu 24.04")
repoExp=$("*.list" "*.sources")
# Получаем текущую версию операционной системы # Получаем текущую версию операционной системы
disOs=$(lsb_release -si) disOs=$(lsb_release -si)
@ -170,7 +171,16 @@ while true; do
defPhp=$(apt-cache policy php | awk -F ': ' '/Candidate:/ {split($2, a, "[:+~]"); print a[2]}') defPhp=$(apt-cache policy php | awk -F ': ' '/Candidate:/ {split($2, a, "[:+~]"); print a[2]}')
fi fi
else else
if [ ! -f "/etc/apt/sources.list.d/ondrej-ubuntu-php-*.list" ]; then foundExp=false
# Проверяем наличие каждого файла
for exp in "${repoExp[@]}"; do
if [ ! -f "/etc/apt/sources.list.d/ondrej-ubuntu-php-$exp" ]; then
foundExp=true
fi
done
if [ "$foundExp" = false ]; then
echo "===================================" 2>&1 | sudo tee -a "$logsInst" > /dev/null echo "===================================" 2>&1 | sudo tee -a "$logsInst" > /dev/null
echo "Репозиторий php не обнаружен. Добавляем..." | tee -a "$logsInst" echo "Репозиторий php не обнаружен. Добавляем..." | tee -a "$logsInst"
echo "===================================" 2>&1 | sudo tee -a "$logsInst" > /dev/null echo "===================================" 2>&1 | sudo tee -a "$logsInst" > /dev/null
@ -206,7 +216,16 @@ while true; do
sudo apt-get -y dist-upgrade 2>&1 | sudo tee -a "$logsInst" > /dev/null sudo apt-get -y dist-upgrade 2>&1 | sudo tee -a "$logsInst" > /dev/null
fi fi
else else
if [ ! -f "/etc/apt/sources.list.d/ondrej-ubuntu-nginx-*.list" ]; then foundExp=false
# Проверяем наличие каждого файла
for exp in "${repoExp[@]}"; do
if [ ! -f "/etc/apt/sources.list.d/ondrej-ubuntu-nginx-$exp" ]; then
foundExp=true
fi
done
if [ "$foundExp" = false ]; then
echo "===================================" 2>&1 | sudo tee -a "$logsInst" > /dev/null echo "===================================" 2>&1 | sudo tee -a "$logsInst" > /dev/null
echo "Репозиторий nginx не обнаружен. Добавляем..." | tee -a "$logsInst" echo "Репозиторий nginx не обнаружен. Добавляем..." | tee -a "$logsInst"
echo "===================================" 2>&1 | sudo tee -a "$logsInst" > /dev/null echo "===================================" 2>&1 | sudo tee -a "$logsInst" > /dev/null
@ -560,7 +579,16 @@ EOF
sudo apt-get -y dist-upgrade 2>&1 | sudo tee -a "$logsInst" > /dev/null sudo apt-get -y dist-upgrade 2>&1 | sudo tee -a "$logsInst" > /dev/null
fi fi
else else
if [ ! -f "/etc/apt/sources.list.d/ondrej-ubuntu-nginx-*.list" ]; then foundExp=false
# Проверяем наличие каждого файла
for exp in "${repoExp[@]}"; do
if [ ! -f "/etc/apt/sources.list.d/ondrej-ubuntu-nginx-$exp" ]; then
foundExp=true
fi
done
if [ "$foundExp" = false ]; then
echo "===================================" 2>&1 | sudo tee -a "$logsInst" > /dev/null echo "===================================" 2>&1 | sudo tee -a "$logsInst" > /dev/null
echo "Репозиторий nginx не обнаружен. Добавляем..." | tee -a "$logsInst" echo "Репозиторий nginx не обнаружен. Добавляем..." | tee -a "$logsInst"
echo "===================================" 2>&1 | sudo tee -a "$logsInst" > /dev/null echo "===================================" 2>&1 | sudo tee -a "$logsInst" > /dev/null