Skip to content

Commit da6fcb8

Browse files
committed
fix gcore install
1 parent 0a5002d commit da6fcb8

1 file changed

Lines changed: 14 additions & 12 deletions

File tree

install_remnawave.sh

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
SCRIPT_VERSION="2.3.2"
3+
SCRIPT_VERSION="2.3.3"
44
UPDATE_AVAILABLE=false
55
DIR_REMNAWAVE="/usr/local/remnawave_reverse/"
66
LANG_FILE="${DIR_REMNAWAVE}selected_language"
@@ -454,7 +454,6 @@ set_language() {
454454
[DOWNLOAD_FALLBACK]="Trying fallback download method..."
455455
[WARP_DELETE_SUCCESS]="WARP deleted successfully"
456456
[UPDATING_SQUAD]="Updating squad"
457-
[ALIAS_EXISTS]="Alias already exists in %s"
458457
[PORT_8443_NOT_CONFIGURED]="Port 8443 is not configured in docker-compose.yml"
459458
[ARCHIVE_NOT_FOUND]="Archive directory not found"
460459
[FILE_NOT_FOUND]="File not found:"
@@ -868,7 +867,6 @@ set_language() {
868867
[DOWNLOAD_FALLBACK]="Попытка резервного метода загрузки..."
869868
[WARP_DELETE_SUCCESS]="WARP успешно удалён"
870869
[UPDATING_SQUAD]="Обновление squad"
871-
[ALIAS_EXISTS]="Алиас уже существует в %s"
872870
[PORT_8443_NOT_CONFIGURED]="Порт 8443 не настроен в docker-compose.yml"
873871
[ARCHIVE_NOT_FOUND]="Директория archive не найдена"
874872
[FILE_NOT_FOUND]="Файл не найден:"
@@ -1178,8 +1176,6 @@ install_script_if_missing() {
11781176
echo "$alias_line" >> "$bashrc_file"
11791177
printf "${COLOR_GREEN}${LANG[ALIAS_ADDED]}${COLOR_RESET}\n" "$bashrc_file"
11801178
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"
11831179
fi
11841180
}
11851181

@@ -2713,12 +2709,6 @@ install_packages() {
27132709
return 1
27142710
fi
27152711

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-
27222712
if ! dpkg -l | grep -q '^ii.*cron '; then
27232713
if ! apt-get install -y cron; then
27242714
echo -e "${COLOR_RED}${LANG[ERROR_INSTALL_CRON]}" "${COLOR_RESET}" >&2
@@ -3047,10 +3037,22 @@ EOL
30473037
# Gcore DNS-01 (wildcard)
30483038

30493039
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
30513051
echo -e "${COLOR_RED}${LANG[ERROR_INSTALL_GCORE_PLUGIN]}${COLOR_RESET}"
30523052
exit 1
30533053
fi
3054+
else
3055+
echo -e "${COLOR_GREEN}Gcore plugin already available.${COLOR_RESET}"
30543056
fi
30553057

30563058
reading "${LANG[ENTER_GCORE_TOKEN]}" GCORE_API_KEY

0 commit comments

Comments
 (0)