diff --git a/install.sh b/install.sh index 3879878..cd8ee33 100755 --- a/install.sh +++ b/install.sh @@ -66,7 +66,7 @@ update_config() { printf "\033[48;5;196m\033[1m║ ! Обнаружена старая версия podkop. ║\033[0m\n" printf "\033[48;5;196m\033[1m║ Если продолжите обновление, вам потребуется настроить Podkop заново. ║\033[0m\n" printf "\033[48;5;196m\033[1m║ Старая конфигурация будет сохранена в /etc/config/podkop-070 ║\033[0m\n" - printf "\033[48;5;196m\033[1m║ Подробности: LINK ║\033[0m\n" + printf "\033[48;5;196m\033[1m║ Подробности: https://github.com/itdoginfo/podkop ║\033[0m\n" printf "\033[48;5;196m\033[1m║ Точно хотите продолжить? ║\033[0m\n" printf "\033[48;5;196m\033[1m╚══════════════════════════════════════════════════════════════════════╝\033[0m\n" @@ -76,7 +76,7 @@ update_config() { printf "\033[48;5;196m\033[1m║ ! Detected old podkop version. ║\033[0m\n" printf "\033[48;5;196m\033[1m║ If you continue the update, you will need to RECONFIGURE podkop. ║\033[0m\n" printf "\033[48;5;196m\033[1m║ Your old configuration will be saved to /etc/config/podkop-070 ║\033[0m\n" - printf "\033[48;5;196m\033[1m║ Details: LINK ║\033[0m\n" + printf "\033[48;5;196m\033[1m║ Details: https://github.com/itdoginfo/podkop ║\033[0m\n" printf "\033[48;5;196m\033[1m║ Are you sure you want to continue? ║\033[0m\n" printf "\033[48;5;196m\033[1m╚══════════════════════════════════════════════════════════════════════╝\033[0m\n" @@ -240,34 +240,34 @@ check_system() { exit 1 fi - # Check version - # if command -v podkop > /dev/null 2>&1; then - # local version - # version=$(/usr/bin/podkop show_version 2> /dev/null) - # if [ -n "$version" ]; then - # version=$(echo "$version" | sed 's/^v//') - # local major - # local minor - # local patch - # major=$(echo "$version" | cut -d. -f1) - # minor=$(echo "$version" | cut -d. -f2) - # patch=$(echo "$version" | cut -d. -f3) + Check version + if command -v podkop > /dev/null 2>&1; then + local version + version=$(/usr/bin/podkop show_version 2> /dev/null) + if [ -n "$version" ]; then + version=$(echo "$version" | sed 's/^v//') + local major + local minor + local patch + major=$(echo "$version" | cut -d. -f1) + minor=$(echo "$version" | cut -d. -f2) + patch=$(echo "$version" | cut -d. -f3) - # # Compare version: must be >= 0.7.0 - # if [ "$major" -gt 0 ] || - # [ "$major" -eq 0 ] && [ "$minor" -gt 7 ] || - # [ "$major" -eq 0 ] && [ "$minor" -eq 7 ] && [ "$patch" -ge 0 ]; then - # msg "Podkop version >= 0.7.0" - # break - # else - # msg "Podkop version < 0.7.0" - # update_config - # fi - # else - # msg "Unknown podkop version" - # update_config - # fi - # fi + # Compare version: must be >= 0.7.0 + if [ "$major" -gt 0 ] || + [ "$major" -eq 0 ] && [ "$minor" -gt 7 ] || + [ "$major" -eq 0 ] && [ "$minor" -eq 7 ] && [ "$patch" -ge 0 ]; then + msg "Podkop version >= 0.7.0" + break + else + msg "Podkop version < 0.7.0" + update_config + fi + else + msg "Unknown podkop version" + update_config + fi + fi if pkg_is_installed https-dns-proxy; then msg "Сonflicting package detected: https-dns-proxy. Remove?"