From aa5dcea7955ffd879ce951bddcc793d24253d3a8 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Fri, 14 Aug 2026 16:56:46 +0200 Subject: [PATCH] fix rsync parameter rsh --- src/backup | 2 +- tests/backup_tests.bats | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/backup b/src/backup index 37be4a9..0d122c5 100755 --- a/src/backup +++ b/src/backup @@ -229,7 +229,7 @@ path_backup() for exclude in "${excludes[@]}"; do rsyncargs+=("--exclude=$exclude") done - rsyncargs+=("--rsh=\"ssh -p $port\"") + rsyncargs+=("--rsh=ssh -p $port") [ -n "$last_backup_dir_path" ] \ && rsyncargs+=("--link-dest=$last_backup_dir_path/$machine") diff --git a/tests/backup_tests.bats b/tests/backup_tests.bats index 24133c9..d48cc4f 100755 --- a/tests/backup_tests.bats +++ b/tests/backup_tests.bats @@ -668,7 +668,7 @@ teardown() { assert_equal "$(awk 'NR==8 {print; exit}' "$RSYNC_LOG")" "--human-readable" assert_equal "$(awk 'NR==9 {print; exit}' "$RSYNC_LOG")" "--exclude=/home/user/.cache" assert_equal "$(awk 'NR==10 {print; exit}' "$RSYNC_LOG")" "--exclude=/home/user/.local" - assert_equal "$(awk 'NR==11 {print; exit}' "$RSYNC_LOG")" "--rsh=\"ssh -p 22\"" + assert_equal "$(awk 'NR==11 {print; exit}' "$RSYNC_LOG")" "--rsh=ssh -p 22" assert_equal "$(awk 'NR==12 {print; exit}' "$RSYNC_LOG")" "backupuser@www.example.com:/etc" assert_equal "$(awk 'NR==13 {print; exit}' "$RSYNC_LOG")" "build/test/2000-01-01_01_backup/testpc1.example.com" @@ -690,7 +690,7 @@ teardown() { assert_equal "$(awk 'NR==6 {print; exit}' "$RSYNC_LOG")" "--hard-links" assert_equal "$(awk 'NR==7 {print; exit}' "$RSYNC_LOG")" "--relative" assert_equal "$(awk 'NR==8 {print; exit}' "$RSYNC_LOG")" "--human-readable" - assert_equal "$(awk 'NR==9 {print; exit}' "$RSYNC_LOG")" "--rsh=\"ssh -p 22\"" + assert_equal "$(awk 'NR==9 {print; exit}' "$RSYNC_LOG")" "--rsh=ssh -p 22" assert_equal "$(awk 'NR==10 {print; exit}' "$RSYNC_LOG")" "backupuser@www.example.com:/home/other" assert_equal "$(awk 'NR==11 {print; exit}' "$RSYNC_LOG")" "build/test/2000-01-01_01_backup/testpc2" } @@ -711,7 +711,7 @@ teardown() { assert_equal "$(awk 'NR==6 {print; exit}' "$RSYNC_LOG")" "--hard-links" assert_equal "$(awk 'NR==7 {print; exit}' "$RSYNC_LOG")" "--relative" assert_equal "$(awk 'NR==8 {print; exit}' "$RSYNC_LOG")" "--human-readable" - assert_equal "$(awk 'NR==9 {print; exit}' "$RSYNC_LOG")" "--rsh=\"ssh -p 22\"" + assert_equal "$(awk 'NR==9 {print; exit}' "$RSYNC_LOG")" "--rsh=ssh -p 22" assert_equal "$(awk 'NR==10 {print; exit}' "$RSYNC_LOG")" "/home/local" assert_equal "$(awk 'NR==11 {print; exit}' "$RSYNC_LOG")" "build/test/2000-01-01_01_backup/onlylocal" } @@ -734,7 +734,7 @@ teardown() { assert_equal "$(awk 'NR==6 {print; exit}' "$RSYNC_LOG")" "--hard-links" assert_equal "$(awk 'NR==7 {print; exit}' "$RSYNC_LOG")" "--relative" assert_equal "$(awk 'NR==8 {print; exit}' "$RSYNC_LOG")" "--human-readable" - assert_equal "$(awk 'NR==9 {print; exit}' "$RSYNC_LOG")" "--rsh=\"ssh -p 22\"" + assert_equal "$(awk 'NR==9 {print; exit}' "$RSYNC_LOG")" "--rsh=ssh -p 22" assert_equal "$(awk 'NR==10 {print; exit}' "$RSYNC_LOG")" "--link-dest=build/test/1999-12-31_01_backup/onlylocal" assert_equal "$(awk 'NR==11 {print; exit}' "$RSYNC_LOG")" "/home/local" assert_equal "$(awk 'NR==12 {print; exit}' "$RSYNC_LOG")" "build/test/2000-01-01_01_backup/onlylocal" -- 2.47.3