Petro1990
/
rProxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

исправление: удалены все несовместимые перенаправления в циклах for и исправлена логика do_setup

This commit is contained in:
Petro1990 2026-03-13 14:38:46 +03:00
parent 22eda756b5
commit 08fb563324
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rproxy
View File

@ -115,7 +115,7 @@ is_running() {
count_services() { count_services() {
local count=0 local count=0
for f in "$SERVICES_DIR"/*.conf 2>/dev/null; do for f in "$SERVICES_DIR"/*.conf; do
[ -f "$f" ] && count=$((count + 1)) [ -f "$f" ] && count=$((count + 1))
done done
echo $count echo $count
@ -199,7 +199,7 @@ show_status() {
printf " ${BOLD}%-4s %-14s %-22s %-7s %-9s %-18s${NC}\n" "№" "ИМЯ" "ЦЕЛЬ" "ПОРТ" "СТАТУС" "ДОМЕН" printf " ${BOLD}%-4s %-14s %-22s %-7s %-9s %-18s${NC}\n" "№" "ИМЯ" "ЦЕЛЬ" "ПОРТ" "СТАТУС" "ДОМЕН"
draw_separator draw_separator
for f in "$SERVICES_DIR"/*.conf 2>/dev/null; do for f in "$SERVICES_DIR"/*.conf; do
[ -f "$f" ] || continue [ -f "$f" ] || continue
has_services=1 has_services=1
idx=$((idx + 1)) idx=$((idx + 1))
@ -395,7 +395,7 @@ do_remove_interactive() {
local services="" local services=""
local idx=0 local idx=0
for f in "$SERVICES_DIR"/*.conf 2>/dev/null; do for f in "$SERVICES_DIR"/*.conf; do
[ -f "$f" ] || continue [ -f "$f" ] || continue
idx=$((idx + 1)) idx=$((idx + 1))
. "$f" . "$f"
@ -452,7 +452,7 @@ select_service() {
local services="" local services=""
local idx=0 local idx=0
for f in "$SERVICES_DIR"/*.conf 2>/dev/null; do for f in "$SERVICES_DIR"/*.conf; do
[ -f "$f" ] || continue [ -f "$f" ] || continue
. "$f" . "$f"
@ -533,7 +533,7 @@ do_restart_interactive() {
select_service "Перезапустить" "all" || { pause; return; } select_service "Перезапустить" "all" || { pause; return; }
if [ "$SELECTED_SERVICE" = "__ALL__" ]; then if [ "$SELECTED_SERVICE" = "__ALL__" ]; then
for f in "$SERVICES_DIR"/*.conf 2>/dev/null; do for f in "$SERVICES_DIR"/*.conf; do
[ -f "$f" ] || continue [ -f "$f" ] || continue
. "$f" . "$f"
do_stop_service "$SVC_NAME" do_stop_service "$SVC_NAME"
@ -616,7 +616,7 @@ do_stop_service() {
} }
do_start_all() { do_start_all() {
for f in "$SERVICES_DIR"/*.conf 2>/dev/null; do for f in "$SERVICES_DIR"/*.conf; do
[ -f "$f" ] || continue [ -f "$f" ] || continue
. "$f" . "$f"
[ "$SVC_ENABLED" = "yes" ] && do_start_service "$SVC_NAME" [ "$SVC_ENABLED" = "yes" ] && do_start_service "$SVC_NAME"
@ -624,7 +624,7 @@ do_start_all() {
} }
do_stop_all() { do_stop_all() {
for f in "$SERVICES_DIR"/*.conf 2>/dev/null; do for f in "$SERVICES_DIR"/*.conf; do
[ -f "$f" ] || continue [ -f "$f" ] || continue
. "$f" . "$f"
do_stop_service "$SVC_NAME" do_stop_service "$SVC_NAME"
@ -682,8 +682,6 @@ do_setup() {
read -r vps_pass read -r vps_pass
stty echo 2>/dev/null stty echo 2>/dev/null
printf "\n" printf "\n"
fi
else else
if [ ! -f "$SSH_KEY" ]; then if [ ! -f "$SSH_KEY" ]; then
msg "Генерирую SSH-ключ..." msg "Генерирую SSH-ключ..."
@ -778,7 +776,7 @@ case "${1:-}" in
restart) check_conf && do_stop_all; sleep 1; do_start_all ;; restart) check_conf && do_stop_all; sleep 1; do_start_all ;;
status) status)
check_conf || { err "VPS не настроен"; exit 1; } check_conf || { err "VPS не настроен"; exit 1; }
for f in "$SERVICES_DIR"/*.conf 2>/dev/null; do for f in "$SERVICES_DIR"/*.conf; do
[ -f "$f" ] || continue [ -f "$f" ] || continue
. "$f" . "$f"
local state="остановлен" local state="остановлен"