From 887534c033738bd6b19464ca180b049e131d06a5 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 25 May 2020 14:55:46 -0500 Subject: [PATCH] Move cmd to lib/ and reverse symlink This prepares for removal of the bup-python wrapper. Given this change we'll be able to have the same sys.path in the source tree and install tree, and so won't have to go back to mangling that during installs. Signed-off-by: Rob Browning Tested-by: Rob Browning --- .gitignore | 4 +++- bup | 2 +- cmd | 1 + lib/cmd | 1 - {cmd => lib/cmd}/bloom-cmd.py | 0 {cmd => lib/cmd}/bup | 0 {cmd => lib/cmd}/cat-file-cmd.py | 0 {cmd => lib/cmd}/daemon-cmd.py | 0 {cmd => lib/cmd}/damage-cmd.py | 0 {cmd => lib/cmd}/drecurse-cmd.py | 0 {cmd => lib/cmd}/fsck-cmd.py | 0 {cmd => lib/cmd}/ftp-cmd.py | 0 {cmd => lib/cmd}/fuse-cmd.py | 0 {cmd => lib/cmd}/gc-cmd.py | 0 {cmd => lib/cmd}/get-cmd.py | 0 {cmd => lib/cmd}/help-cmd.py | 0 {cmd => lib/cmd}/import-duplicity-cmd.py | 0 {cmd => lib/cmd}/import-rdiff-backup-cmd.sh | 0 {cmd => lib/cmd}/import-rsnapshot-cmd.sh | 0 {cmd => lib/cmd}/index-cmd.py | 0 {cmd => lib/cmd}/init-cmd.py | 0 {cmd => lib/cmd}/join-cmd.py | 0 {cmd => lib/cmd}/list-idx-cmd.py | 0 {cmd => lib/cmd}/ls-cmd.py | 0 {cmd => lib/cmd}/margin-cmd.py | 0 {cmd => lib/cmd}/memtest-cmd.py | 0 {cmd => lib/cmd}/meta-cmd.py | 0 {cmd => lib/cmd}/midx-cmd.py | 0 {cmd => lib/cmd}/mux-cmd.py | 0 {cmd => lib/cmd}/on--server-cmd.py | 0 {cmd => lib/cmd}/on-cmd.py | 0 {cmd => lib/cmd}/prune-older-cmd.py | 0 {cmd => lib/cmd}/python-cmd.sh | 2 +- {cmd => lib/cmd}/random-cmd.py | 0 {cmd => lib/cmd}/restore-cmd.py | 0 {cmd => lib/cmd}/rm-cmd.py | 0 {cmd => lib/cmd}/save-cmd.py | 0 {cmd => lib/cmd}/server-cmd.py | 0 {cmd => lib/cmd}/split-cmd.py | 0 {cmd => lib/cmd}/tag-cmd.py | 0 {cmd => lib/cmd}/tick-cmd.py | 0 {cmd => lib/cmd}/version-cmd.py | 0 {cmd => lib/cmd}/web-cmd.py | 0 {cmd => lib/cmd}/xstat-cmd.py | 0 t/test-import-rdiff-backup.sh | 2 +- 45 files changed, 7 insertions(+), 5 deletions(-) create mode 120000 cmd delete mode 120000 lib/cmd rename {cmd => lib/cmd}/bloom-cmd.py (100%) rename {cmd => lib/cmd}/bup (100%) rename {cmd => lib/cmd}/cat-file-cmd.py (100%) rename {cmd => lib/cmd}/daemon-cmd.py (100%) rename {cmd => lib/cmd}/damage-cmd.py (100%) rename {cmd => lib/cmd}/drecurse-cmd.py (100%) rename {cmd => lib/cmd}/fsck-cmd.py (100%) rename {cmd => lib/cmd}/ftp-cmd.py (100%) rename {cmd => lib/cmd}/fuse-cmd.py (100%) rename {cmd => lib/cmd}/gc-cmd.py (100%) rename {cmd => lib/cmd}/get-cmd.py (100%) rename {cmd => lib/cmd}/help-cmd.py (100%) rename {cmd => lib/cmd}/import-duplicity-cmd.py (100%) rename {cmd => lib/cmd}/import-rdiff-backup-cmd.sh (100%) rename {cmd => lib/cmd}/import-rsnapshot-cmd.sh (100%) rename {cmd => lib/cmd}/index-cmd.py (100%) rename {cmd => lib/cmd}/init-cmd.py (100%) rename {cmd => lib/cmd}/join-cmd.py (100%) rename {cmd => lib/cmd}/list-idx-cmd.py (100%) rename {cmd => lib/cmd}/ls-cmd.py (100%) rename {cmd => lib/cmd}/margin-cmd.py (100%) rename {cmd => lib/cmd}/memtest-cmd.py (100%) rename {cmd => lib/cmd}/meta-cmd.py (100%) rename {cmd => lib/cmd}/midx-cmd.py (100%) rename {cmd => lib/cmd}/mux-cmd.py (100%) rename {cmd => lib/cmd}/on--server-cmd.py (100%) rename {cmd => lib/cmd}/on-cmd.py (100%) rename {cmd => lib/cmd}/prune-older-cmd.py (100%) rename {cmd => lib/cmd}/python-cmd.sh (94%) rename {cmd => lib/cmd}/random-cmd.py (100%) rename {cmd => lib/cmd}/restore-cmd.py (100%) rename {cmd => lib/cmd}/rm-cmd.py (100%) rename {cmd => lib/cmd}/save-cmd.py (100%) rename {cmd => lib/cmd}/server-cmd.py (100%) rename {cmd => lib/cmd}/split-cmd.py (100%) rename {cmd => lib/cmd}/tag-cmd.py (100%) rename {cmd => lib/cmd}/tick-cmd.py (100%) rename {cmd => lib/cmd}/version-cmd.py (100%) rename {cmd => lib/cmd}/web-cmd.py (100%) rename {cmd => lib/cmd}/xstat-cmd.py (100%) diff --git a/.gitignore b/.gitignore index 8ea45fe..0688ef5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -/cmd/bup-* +\#*# +.#* randomgen memtest *.o @@ -12,6 +13,7 @@ memtest /build *.swp nbproject +/lib/cmd/bup-* /t/sampledata/var/ /t/tmp/ /lib/bup/_checkout.py diff --git a/bup b/bup index f4083c1..e1c0ca8 120000 --- a/bup +++ b/bup @@ -1 +1 @@ -cmd/bup \ No newline at end of file +lib/cmd/bup \ No newline at end of file diff --git a/cmd b/cmd new file mode 120000 index 0000000..7819428 --- /dev/null +++ b/cmd @@ -0,0 +1 @@ +lib/cmd \ No newline at end of file diff --git a/lib/cmd b/lib/cmd deleted file mode 120000 index 9287aae..0000000 --- a/lib/cmd +++ /dev/null @@ -1 +0,0 @@ -../cmd \ No newline at end of file diff --git a/cmd/bloom-cmd.py b/lib/cmd/bloom-cmd.py similarity index 100% rename from cmd/bloom-cmd.py rename to lib/cmd/bloom-cmd.py diff --git a/cmd/bup b/lib/cmd/bup similarity index 100% rename from cmd/bup rename to lib/cmd/bup diff --git a/cmd/cat-file-cmd.py b/lib/cmd/cat-file-cmd.py similarity index 100% rename from cmd/cat-file-cmd.py rename to lib/cmd/cat-file-cmd.py diff --git a/cmd/daemon-cmd.py b/lib/cmd/daemon-cmd.py similarity index 100% rename from cmd/daemon-cmd.py rename to lib/cmd/daemon-cmd.py diff --git a/cmd/damage-cmd.py b/lib/cmd/damage-cmd.py similarity index 100% rename from cmd/damage-cmd.py rename to lib/cmd/damage-cmd.py diff --git a/cmd/drecurse-cmd.py b/lib/cmd/drecurse-cmd.py similarity index 100% rename from cmd/drecurse-cmd.py rename to lib/cmd/drecurse-cmd.py diff --git a/cmd/fsck-cmd.py b/lib/cmd/fsck-cmd.py similarity index 100% rename from cmd/fsck-cmd.py rename to lib/cmd/fsck-cmd.py diff --git a/cmd/ftp-cmd.py b/lib/cmd/ftp-cmd.py similarity index 100% rename from cmd/ftp-cmd.py rename to lib/cmd/ftp-cmd.py diff --git a/cmd/fuse-cmd.py b/lib/cmd/fuse-cmd.py similarity index 100% rename from cmd/fuse-cmd.py rename to lib/cmd/fuse-cmd.py diff --git a/cmd/gc-cmd.py b/lib/cmd/gc-cmd.py similarity index 100% rename from cmd/gc-cmd.py rename to lib/cmd/gc-cmd.py diff --git a/cmd/get-cmd.py b/lib/cmd/get-cmd.py similarity index 100% rename from cmd/get-cmd.py rename to lib/cmd/get-cmd.py diff --git a/cmd/help-cmd.py b/lib/cmd/help-cmd.py similarity index 100% rename from cmd/help-cmd.py rename to lib/cmd/help-cmd.py diff --git a/cmd/import-duplicity-cmd.py b/lib/cmd/import-duplicity-cmd.py similarity index 100% rename from cmd/import-duplicity-cmd.py rename to lib/cmd/import-duplicity-cmd.py diff --git a/cmd/import-rdiff-backup-cmd.sh b/lib/cmd/import-rdiff-backup-cmd.sh similarity index 100% rename from cmd/import-rdiff-backup-cmd.sh rename to lib/cmd/import-rdiff-backup-cmd.sh diff --git a/cmd/import-rsnapshot-cmd.sh b/lib/cmd/import-rsnapshot-cmd.sh similarity index 100% rename from cmd/import-rsnapshot-cmd.sh rename to lib/cmd/import-rsnapshot-cmd.sh diff --git a/cmd/index-cmd.py b/lib/cmd/index-cmd.py similarity index 100% rename from cmd/index-cmd.py rename to lib/cmd/index-cmd.py diff --git a/cmd/init-cmd.py b/lib/cmd/init-cmd.py similarity index 100% rename from cmd/init-cmd.py rename to lib/cmd/init-cmd.py diff --git a/cmd/join-cmd.py b/lib/cmd/join-cmd.py similarity index 100% rename from cmd/join-cmd.py rename to lib/cmd/join-cmd.py diff --git a/cmd/list-idx-cmd.py b/lib/cmd/list-idx-cmd.py similarity index 100% rename from cmd/list-idx-cmd.py rename to lib/cmd/list-idx-cmd.py diff --git a/cmd/ls-cmd.py b/lib/cmd/ls-cmd.py similarity index 100% rename from cmd/ls-cmd.py rename to lib/cmd/ls-cmd.py diff --git a/cmd/margin-cmd.py b/lib/cmd/margin-cmd.py similarity index 100% rename from cmd/margin-cmd.py rename to lib/cmd/margin-cmd.py diff --git a/cmd/memtest-cmd.py b/lib/cmd/memtest-cmd.py similarity index 100% rename from cmd/memtest-cmd.py rename to lib/cmd/memtest-cmd.py diff --git a/cmd/meta-cmd.py b/lib/cmd/meta-cmd.py similarity index 100% rename from cmd/meta-cmd.py rename to lib/cmd/meta-cmd.py diff --git a/cmd/midx-cmd.py b/lib/cmd/midx-cmd.py similarity index 100% rename from cmd/midx-cmd.py rename to lib/cmd/midx-cmd.py diff --git a/cmd/mux-cmd.py b/lib/cmd/mux-cmd.py similarity index 100% rename from cmd/mux-cmd.py rename to lib/cmd/mux-cmd.py diff --git a/cmd/on--server-cmd.py b/lib/cmd/on--server-cmd.py similarity index 100% rename from cmd/on--server-cmd.py rename to lib/cmd/on--server-cmd.py diff --git a/cmd/on-cmd.py b/lib/cmd/on-cmd.py similarity index 100% rename from cmd/on-cmd.py rename to lib/cmd/on-cmd.py diff --git a/cmd/prune-older-cmd.py b/lib/cmd/prune-older-cmd.py similarity index 100% rename from cmd/prune-older-cmd.py rename to lib/cmd/prune-older-cmd.py diff --git a/cmd/python-cmd.sh b/lib/cmd/python-cmd.sh similarity index 94% rename from cmd/python-cmd.sh rename to lib/cmd/python-cmd.sh index 3cedf2d..b0a8d3d 100644 --- a/cmd/python-cmd.sh +++ b/lib/cmd/python-cmd.sh @@ -13,7 +13,7 @@ done script_home="$(cd "$(dirname "$cmdpath")" && pwd -P)" cd "$top" -bup_libdir="$script_home/../lib" # bup_libdir will be adjusted during install +bup_libdir="$script_home/.." # bup_libdir will be adjusted during install export PYTHONPATH="$bup_libdir${PYTHONPATH:+:$PYTHONPATH}" # Force python to use ISO-8859-1 (aka Latin 1), a single-byte diff --git a/cmd/random-cmd.py b/lib/cmd/random-cmd.py similarity index 100% rename from cmd/random-cmd.py rename to lib/cmd/random-cmd.py diff --git a/cmd/restore-cmd.py b/lib/cmd/restore-cmd.py similarity index 100% rename from cmd/restore-cmd.py rename to lib/cmd/restore-cmd.py diff --git a/cmd/rm-cmd.py b/lib/cmd/rm-cmd.py similarity index 100% rename from cmd/rm-cmd.py rename to lib/cmd/rm-cmd.py diff --git a/cmd/save-cmd.py b/lib/cmd/save-cmd.py similarity index 100% rename from cmd/save-cmd.py rename to lib/cmd/save-cmd.py diff --git a/cmd/server-cmd.py b/lib/cmd/server-cmd.py similarity index 100% rename from cmd/server-cmd.py rename to lib/cmd/server-cmd.py diff --git a/cmd/split-cmd.py b/lib/cmd/split-cmd.py similarity index 100% rename from cmd/split-cmd.py rename to lib/cmd/split-cmd.py diff --git a/cmd/tag-cmd.py b/lib/cmd/tag-cmd.py similarity index 100% rename from cmd/tag-cmd.py rename to lib/cmd/tag-cmd.py diff --git a/cmd/tick-cmd.py b/lib/cmd/tick-cmd.py similarity index 100% rename from cmd/tick-cmd.py rename to lib/cmd/tick-cmd.py diff --git a/cmd/version-cmd.py b/lib/cmd/version-cmd.py similarity index 100% rename from cmd/version-cmd.py rename to lib/cmd/version-cmd.py diff --git a/cmd/web-cmd.py b/lib/cmd/web-cmd.py similarity index 100% rename from cmd/web-cmd.py rename to lib/cmd/web-cmd.py diff --git a/cmd/xstat-cmd.py b/lib/cmd/xstat-cmd.py similarity index 100% rename from cmd/xstat-cmd.py rename to lib/cmd/xstat-cmd.py diff --git a/t/test-import-rdiff-backup.sh b/t/test-import-rdiff-backup.sh index 56c7b1e..359f081 100755 --- a/t/test-import-rdiff-backup.sh +++ b/t/test-import-rdiff-backup.sh @@ -22,7 +22,7 @@ WVSTART "import-rdiff-backup" WVPASS bup init WVPASS cd "$tmpdir" WVPASS mkdir rdiff-backup -WVPASS rdiff-backup "$top/cmd" rdiff-backup +WVPASS rdiff-backup "$top/lib/cmd" rdiff-backup WVPASS bup tick WVPASS rdiff-backup "$top/Documentation" rdiff-backup WVPASS bup import-rdiff-backup rdiff-backup import-rdiff-backup -- 2.39.2