|
1 | 1 | #!/bin/bash |
2 | 2 |
|
3 | | -SCRIPT_VERSION="2.3.2" |
| 3 | +SCRIPT_VERSION="2.3.3" |
4 | 4 | UPDATE_AVAILABLE=false |
5 | 5 | DIR_REMNAWAVE="/usr/local/remnawave_reverse/" |
6 | 6 | LANG_FILE="${DIR_REMNAWAVE}selected_language" |
@@ -454,7 +454,6 @@ set_language() { |
454 | 454 | [DOWNLOAD_FALLBACK]="Trying fallback download method..." |
455 | 455 | [WARP_DELETE_SUCCESS]="WARP deleted successfully" |
456 | 456 | [UPDATING_SQUAD]="Updating squad" |
457 | | - [ALIAS_EXISTS]="Alias already exists in %s" |
458 | 457 | [PORT_8443_NOT_CONFIGURED]="Port 8443 is not configured in docker-compose.yml" |
459 | 458 | [ARCHIVE_NOT_FOUND]="Archive directory not found" |
460 | 459 | [FILE_NOT_FOUND]="File not found:" |
@@ -868,7 +867,6 @@ set_language() { |
868 | 867 | [DOWNLOAD_FALLBACK]="Попытка резервного метода загрузки..." |
869 | 868 | [WARP_DELETE_SUCCESS]="WARP успешно удалён" |
870 | 869 | [UPDATING_SQUAD]="Обновление squad" |
871 | | - [ALIAS_EXISTS]="Алиас уже существует в %s" |
872 | 870 | [PORT_8443_NOT_CONFIGURED]="Порт 8443 не настроен в docker-compose.yml" |
873 | 871 | [ARCHIVE_NOT_FOUND]="Директория archive не найдена" |
874 | 872 | [FILE_NOT_FOUND]="Файл не найден:" |
@@ -1178,8 +1176,6 @@ install_script_if_missing() { |
1178 | 1176 | echo "$alias_line" >> "$bashrc_file" |
1179 | 1177 | printf "${COLOR_GREEN}${LANG[ALIAS_ADDED]}${COLOR_RESET}\n" "$bashrc_file" |
1180 | 1178 | printf "${COLOR_YELLOW}${LANG[ALIAS_ACTIVATE_GLOBAL]}${COLOR_RESET}\n" "$bashrc_file" |
1181 | | - else |
1182 | | - printf "${COLOR_YELLOW}${LANG[ALIAS_EXISTS]}${COLOR_RESET}\n" "$bashrc_file" |
1183 | 1179 | fi |
1184 | 1180 | } |
1185 | 1181 |
|
@@ -2713,12 +2709,6 @@ install_packages() { |
2713 | 2709 | return 1 |
2714 | 2710 | fi |
2715 | 2711 |
|
2716 | | - if command -v certbot >/dev/null 2>&1; then |
2717 | | - if ! pip install --break-system-packages certbot-dns-gcore >/dev/null 2>&1; then |
2718 | | - return 1 |
2719 | | - fi |
2720 | | - fi |
2721 | | - |
2722 | 2712 | if ! dpkg -l | grep -q '^ii.*cron '; then |
2723 | 2713 | if ! apt-get install -y cron; then |
2724 | 2714 | echo -e "${COLOR_RED}${LANG[ERROR_INSTALL_CRON]}" "${COLOR_RESET}" >&2 |
@@ -3047,10 +3037,22 @@ EOL |
3047 | 3037 | # Gcore DNS-01 (wildcard) |
3048 | 3038 |
|
3049 | 3039 | if ! certbot plugins 2>/dev/null | grep -q "dns-gcore"; then |
3050 | | - if ! pip install --break-system-packages certbot-dns-gcore >/dev/null 2>&1; then |
| 3040 | + echo -e "${COLOR_YELLOW}Installing certbot-dns-gcore plugin...${COLOR_RESET}" |
| 3041 | + |
| 3042 | + if python3 -m pip install --help 2>&1 | grep -q "break-system-packages"; then |
| 3043 | + python3 -m pip install --break-system-packages certbot-dns-gcore >/dev/null 2>&1 |
| 3044 | + else |
| 3045 | + python3 -m pip install certbot-dns-gcore >/dev/null 2>&1 |
| 3046 | + fi |
| 3047 | + |
| 3048 | + if certbot plugins 2>/dev/null | grep -q "dns-gcore"; then |
| 3049 | + echo -e "${COLOR_GREEN}Plugin installed successfully.${COLOR_RESET}" |
| 3050 | + else |
3051 | 3051 | echo -e "${COLOR_RED}${LANG[ERROR_INSTALL_GCORE_PLUGIN]}${COLOR_RESET}" |
3052 | 3052 | exit 1 |
3053 | 3053 | fi |
| 3054 | + else |
| 3055 | + echo -e "${COLOR_GREEN}Gcore plugin already available.${COLOR_RESET}" |
3054 | 3056 | fi |
3055 | 3057 |
|
3056 | 3058 | reading "${LANG[ENTER_GCORE_TOKEN]}" GCORE_API_KEY |
|
0 commit comments