diff --git a/setup.cfg b/setup.cfg index 3a36d5e..07d30e4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -32,7 +32,8 @@ where = src [options.entry_points] ; https://setuptools.readthedocs.io/en/latest/userguide/entry_point.html console_scripts = - btrfs-send-chunks-v2 = p1st.btrfs_send_chunks_v2:main - btrfs-send-chunks-v3 = p1st.btrfs_send_chunks_v3:main - btrfs-receive-chunks-v2 = p1st.btrfs_receive_chunks_v2:main - btrfs-receive-chunks-v3 = p1st.btrfs_receive_chunks_v3:main + btrfs-send-chunks-active = p1st.btrfs_send_chunks_active:main + btrfs-receive-chunks-passive = p1st.btrfs_receive_chunks_passive:main + + btrfs-send-chunks-passive = p1st.btrfs_send_chunks_passive:main + btrfs-receive-chunks-active = p1st.btrfs_receive_chunks_active:main diff --git a/src/p1st/btrfs_receive_chunks_v3.py b/src/p1st/btrfs_receive_chunks_active.py similarity index 100% rename from src/p1st/btrfs_receive_chunks_v3.py rename to src/p1st/btrfs_receive_chunks_active.py diff --git a/src/p1st/btrfs_receive_chunks_v2.py b/src/p1st/btrfs_receive_chunks_passive.py similarity index 100% rename from src/p1st/btrfs_receive_chunks_v2.py rename to src/p1st/btrfs_receive_chunks_passive.py diff --git a/src/p1st/btrfs_send_chunks_v2.py b/src/p1st/btrfs_send_chunks_active.py similarity index 100% rename from src/p1st/btrfs_send_chunks_v2.py rename to src/p1st/btrfs_send_chunks_active.py diff --git a/src/p1st/btrfs_send_chunks_v3.py b/src/p1st/btrfs_send_chunks_passive.py similarity index 100% rename from src/p1st/btrfs_send_chunks_v3.py rename to src/p1st/btrfs_send_chunks_passive.py diff --git a/src/p1st/test.py b/src/p1st/test.py index f516439..6d6f502 100644 --- a/src/p1st/test.py +++ b/src/p1st/test.py @@ -148,7 +148,7 @@ def test11(): print(f'\tsudo mkdir {target_dir}') print(f'\tcd {repo_name} && make && sudo make clean && cd ..') print() - print(f'\tsudo btrfs-receive-chunks-v2 {target_path}') + print(f'\tsudo btrfs-receive-chunks-passive {target_path}') print() print(f'=== In another shell, connect with "ssh odroid" ===') @@ -158,7 +158,7 @@ def test11(): print(f'\tsudo btrfs subvolume snapshot -r {child_path}.writeable {child_path}') print(f'\tcd {repo_name} && make && sudo make clean && cd ..') print() - print(f'\tsudo btrfs-send-chunks-v2 {child_path} {ssh_target} {target_path}') + print(f'\tsudo btrfs-send-chunks-active {child_path} {ssh_target} {target_path}') def test12(): @@ -166,9 +166,9 @@ def test12(): ssh_target = 'rootnas' target_path = '/mnt/data/test/blogger.privacy1st.de/20230104T2255' target_chunk_path = '/mnt/data/test/chunks' - print(f'nas: sudo btrfs-receive-chunks-v2 --chunk-dir={target_chunk_path} {target_path}') + print(f'nas: sudo btrfs-receive-chunks-passive --chunk-dir={target_chunk_path} {target_path}') print( - f'odroid: sudo btrfs-send-chunks-v2 --chunk-dir=/mnt/backup/test/chunks --target-chunk-dir={target_chunk_path} {child_path} {ssh_target} {target_path}') + f'odroid: sudo btrfs-send-chunks-active --chunk-dir=/mnt/backup/test/chunks --target-chunk-dir={target_chunk_path} {child_path} {ssh_target} {target_path}') def test13(): @@ -178,8 +178,8 @@ def test13(): target_path = '/mnt/backup/test/blogger.privacy1st.de/20230104T1622_u' - print(f'nas: sudo btrfs-send-chunks-v3 --chunk-dir={source_chunk_dir} {source_path}') - print(f'odroid: sudo btrfs-receive-chunks-v3 {ssh_source} {source_chunk_dir} {target_path}') + print(f'nas: sudo btrfs-send-chunks-passive --chunk-dir={source_chunk_dir} {source_path}') + print(f'odroid: sudo btrfs-receive-chunks-active {ssh_source} {source_chunk_dir} {target_path}') def _init(test_number: int):