From 71590700b03ebd4c0f71fdc0b22423d01f784735 Mon Sep 17 00:00:00 2001 From: HattabbI4 <38787425+HattabbI4@users.noreply.github.com> Date: Thu, 31 Oct 2024 13:52:28 +0500 Subject: [PATCH 1/2] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0?= =?UTF-8?q?=20=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- getdomains-install.sh | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/getdomains-install.sh b/getdomains-install.sh index 184a2d6..0e171cd 100755 --- a/getdomains-install.sh +++ b/getdomains-install.sh @@ -564,19 +564,21 @@ add_dns_resolver() { } add_packages() { - if opkg list-installed | grep -q "curl -"; then - printf "\033[32;1mCurl already installed\033[0m\n" - else - printf "\033[32;1mInstall curl\033[0m\n" - opkg install curl - fi - - if opkg list-installed | grep -q nano; then - printf "\033[32;1mNano already installed\033[0m\n" - else - printf "\033[32;1mInstall nano\033[0m\n" - opkg install nano - fi + for package in curl nano; do + if opkg list-installed | grep -q "^$package "; then + printf "\033[32;1m$package уже установлен\033[0m\n" + else + printf "\033[32;1mУстанавливаем $package...\033[0m\n" + opkg install "$package" + + if "$package" --version >/dev/null 2>&1; then + printf "\033[32;1m$package успешно установлен и доступен\033[0m\n" + else + printf "\033[31;1mОшибка: $package не удалось установить\033[0m\n" + exit 1 + fi + fi + done } add_getdomains() { From a81fe1fb243d0510ace52f52456911c35cd05207 Mon Sep 17 00:00:00 2001 From: HattabbI4 <38787425+HattabbI4@users.noreply.github.com> Date: Thu, 31 Oct 2024 14:53:16 +0500 Subject: [PATCH 2/2] translate log messages --- getdomains-install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/getdomains-install.sh b/getdomains-install.sh index 0e171cd..044fad4 100755 --- a/getdomains-install.sh +++ b/getdomains-install.sh @@ -566,15 +566,15 @@ add_dns_resolver() { add_packages() { for package in curl nano; do if opkg list-installed | grep -q "^$package "; then - printf "\033[32;1m$package уже установлен\033[0m\n" + printf "\033[32;1m$package already installed\033[0m\n" else - printf "\033[32;1mУстанавливаем $package...\033[0m\n" + printf "\033[32;1mInstalling $package...\033[0m\n" opkg install "$package" if "$package" --version >/dev/null 2>&1; then - printf "\033[32;1m$package успешно установлен и доступен\033[0m\n" + printf "\033[32;1m$package was successfully installed and available\033[0m\n" else - printf "\033[31;1mОшибка: $package не удалось установить\033[0m\n" + printf "\033[31;1mError: failed to install $package\033[0m\n" exit 1 fi fi