PapaTramp/ssh-monitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: log_action to stderr so captured paths stay valid

Browse Source 
find_remote_ssh_monitor_path output was polluted by log_action on stdout,
breaking -f checks; mirror user messages to stderr instead.
This commit is contained in:
PTah
2026-05-28 08:24:09 +10:00
parent 731c50b0bc
commit 31c4265716
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
update_ssh_monitor.sh
+4 -2
View File
@@ -216,11 +216,11 @@ log_message() {
fi fi
} }
# Всегда в лог; в stdout — если не --quiet (удобно при ручном запуске и cron с mail) # Всегда в лог; в stderr — если не --quiet (stdout не трогаем: его используют $(find_*))
log_action() { log_action() {
log_message "INFO" "$1" log_message "INFO" "$1"
if [ "$QUIET" -eq 0 ]; then if [ "$QUIET" -eq 0 ]; then
printf '[update_ssh_monitor] %s\n' "$1" printf '[update_ssh_monitor] %s\n' "$1" >&2
fi fi
} }
@@ -782,6 +782,8 @@ update_script() {
sync_installed_updater_from_clone "$@" sync_installed_updater_from_clone "$@"
actual_script_path="$(find_remote_ssh_monitor_path 2>/dev/null || true)" actual_script_path="$(find_remote_ssh_monitor_path 2>/dev/null || true)"
actual_script_path="${actual_script_path//$'\n'/}"
actual_script_path="${actual_script_path//$'\r'/}"
debug_step "Путь к ssh-monitor в клоне: ${actual_script_path:-не найден}" debug_step "Путь к ssh-monitor в клоне: ${actual_script_path:-не найден}"
SAC_CLIENT_CHANGED=0 SAC_CLIENT_CHANGED=0