From c2df125e36f32e00e8aaeda825688626f9371c01 Mon Sep 17 00:00:00 2001 From: Avery Pennarun Date: Sun, 28 Feb 2010 17:05:41 -0500 Subject: [PATCH] Move cmd-*.py to cmd/*-cmd.py. The bup-* programs shouldn't need to be installed into /usr/bin; we should search for them in /usr/lib somewhere. I could have left the names as cmd/cmd-*.py, but the cmd-* was annoying me because of tab completion. Now I can type cmd/ran to get random-cmd.py. --- .gitignore | 2 +- Makefile | 13 ++++++------- cmd-damage.py => cmd/damage-cmd.py | 0 cmd-drecurse.py => cmd/drecurse-cmd.py | 0 cmd-fsck.py => cmd/fsck-cmd.py | 0 cmd-ftp.py => cmd/ftp-cmd.py | 0 cmd-fuse.py => cmd/fuse-cmd.py | 0 cmd-index.py => cmd/index-cmd.py | 0 cmd-init.py => cmd/init-cmd.py | 0 cmd-join.py => cmd/join-cmd.py | 0 cmd-ls.py => cmd/ls-cmd.py | 0 cmd-margin.py => cmd/margin-cmd.py | 0 cmd-memtest.py => cmd/memtest-cmd.py | 0 cmd-midx.py => cmd/midx-cmd.py | 0 cmd-newliner.py => cmd/newliner-cmd.py | 0 cmd-random.py => cmd/random-cmd.py | 0 cmd-save.py => cmd/save-cmd.py | 0 cmd-server.py => cmd/server-cmd.py | 0 cmd-split.py => cmd/split-cmd.py | 0 cmd-tick.py => cmd/tick-cmd.py | 0 main.py | 8 ++++++-- 21 files changed, 13 insertions(+), 10 deletions(-) rename cmd-damage.py => cmd/damage-cmd.py (100%) rename cmd-drecurse.py => cmd/drecurse-cmd.py (100%) rename cmd-fsck.py => cmd/fsck-cmd.py (100%) rename cmd-ftp.py => cmd/ftp-cmd.py (100%) rename cmd-fuse.py => cmd/fuse-cmd.py (100%) rename cmd-index.py => cmd/index-cmd.py (100%) rename cmd-init.py => cmd/init-cmd.py (100%) rename cmd-join.py => cmd/join-cmd.py (100%) rename cmd-ls.py => cmd/ls-cmd.py (100%) rename cmd-margin.py => cmd/margin-cmd.py (100%) rename cmd-memtest.py => cmd/memtest-cmd.py (100%) rename cmd-midx.py => cmd/midx-cmd.py (100%) rename cmd-newliner.py => cmd/newliner-cmd.py (100%) rename cmd-random.py => cmd/random-cmd.py (100%) rename cmd-save.py => cmd/save-cmd.py (100%) rename cmd-server.py => cmd/server-cmd.py (100%) rename cmd-split.py => cmd/split-cmd.py (100%) rename cmd-tick.py => cmd/tick-cmd.py (100%) diff --git a/.gitignore b/.gitignore index 42c8465..03e9223 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /bup -/bup-* +/cmd/bup-* randomgen memtest *.o diff --git a/Makefile b/Makefile index b47dad6..40cae28 100644 --- a/Makefile +++ b/Makefile @@ -19,10 +19,7 @@ endif default: all -all: bup-split bup-join bup-save bup-init bup-server bup-index bup-tick \ - bup-midx bup-fuse bup-ls bup-damage bup-fsck bup-margin bup-drecurse \ - bup-random bup-ftp bup-newliner bup-memtest \ - bup lib/bup/_hashsplit$(SOEXT) \ +all: cmds bup lib/bup/_hashsplit$(SOEXT) \ Documentation/all %/all: @@ -57,9 +54,11 @@ bup: main.py rm -f $@ ln -s $< $@ -bup-%: cmd-%.py +cmds: $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) + +cmd/bup-%: cmd/%-cmd.py rm -f $@ - ln -s $< $@ + ln -s $*-cmd.py $@ %: %.py rm -f $@ @@ -75,6 +74,6 @@ bup-%: cmd-%.sh clean: Documentation/clean rm -f *.o *.so */*/*.so *.dll *.exe .*~ *~ */*~ */*/*~ \ *.pyc */*.pyc */*/*.pyc\ - bup bup-* randomgen memtest \ + bup bup-* cmd/bup-* randomgen memtest \ out[12] out2[tc] tags[12] tags2[tc] rm -rf *.tmp build lib/bup/build diff --git a/cmd-damage.py b/cmd/damage-cmd.py similarity index 100% rename from cmd-damage.py rename to cmd/damage-cmd.py diff --git a/cmd-drecurse.py b/cmd/drecurse-cmd.py similarity index 100% rename from cmd-drecurse.py rename to cmd/drecurse-cmd.py diff --git a/cmd-fsck.py b/cmd/fsck-cmd.py similarity index 100% rename from cmd-fsck.py rename to cmd/fsck-cmd.py diff --git a/cmd-ftp.py b/cmd/ftp-cmd.py similarity index 100% rename from cmd-ftp.py rename to cmd/ftp-cmd.py diff --git a/cmd-fuse.py b/cmd/fuse-cmd.py similarity index 100% rename from cmd-fuse.py rename to cmd/fuse-cmd.py diff --git a/cmd-index.py b/cmd/index-cmd.py similarity index 100% rename from cmd-index.py rename to cmd/index-cmd.py diff --git a/cmd-init.py b/cmd/init-cmd.py similarity index 100% rename from cmd-init.py rename to cmd/init-cmd.py diff --git a/cmd-join.py b/cmd/join-cmd.py similarity index 100% rename from cmd-join.py rename to cmd/join-cmd.py diff --git a/cmd-ls.py b/cmd/ls-cmd.py similarity index 100% rename from cmd-ls.py rename to cmd/ls-cmd.py diff --git a/cmd-margin.py b/cmd/margin-cmd.py similarity index 100% rename from cmd-margin.py rename to cmd/margin-cmd.py diff --git a/cmd-memtest.py b/cmd/memtest-cmd.py similarity index 100% rename from cmd-memtest.py rename to cmd/memtest-cmd.py diff --git a/cmd-midx.py b/cmd/midx-cmd.py similarity index 100% rename from cmd-midx.py rename to cmd/midx-cmd.py diff --git a/cmd-newliner.py b/cmd/newliner-cmd.py similarity index 100% rename from cmd-newliner.py rename to cmd/newliner-cmd.py diff --git a/cmd-random.py b/cmd/random-cmd.py similarity index 100% rename from cmd-random.py rename to cmd/random-cmd.py diff --git a/cmd-save.py b/cmd/save-cmd.py similarity index 100% rename from cmd-save.py rename to cmd/save-cmd.py diff --git a/cmd-server.py b/cmd/server-cmd.py similarity index 100% rename from cmd-server.py rename to cmd/server-cmd.py diff --git a/cmd-split.py b/cmd/split-cmd.py similarity index 100% rename from cmd-split.py rename to cmd/split-cmd.py diff --git a/cmd-tick.py b/cmd/tick-cmd.py similarity index 100% rename from cmd-tick.py rename to cmd/tick-cmd.py diff --git a/main.py b/main.py index d5fab14..36f6544 100755 --- a/main.py +++ b/main.py @@ -7,6 +7,7 @@ exepath = os.path.split(exe)[0] or '.' # fix the PYTHONPATH to include our lib dir libpath = os.path.join(exepath, 'lib') +cmdpath = os.path.join(exepath, 'cmd') sys.path[:0] = [libpath] os.environ['PYTHONPATH'] = libpath + ':' + os.environ.get('PYTHONPATH', '') @@ -15,7 +16,7 @@ from bup.helpers import * def usage(): log('Usage: bup \n\n') log('Available subcommands:\n') - for c in sorted(os.listdir(exepath)): + for c in sorted(os.listdir(cmdpath) + os.listdir(exepath)): if c.startswith('bup-') and c.find('.') < 0: log('\t%s\n' % c[4:]) sys.exit(99) @@ -28,7 +29,10 @@ if subcmd == 'help': usage() def subpath(s): - return os.path.join(exepath, 'bup-%s' % s) + sp = os.path.join(exepath, 'bup-%s' % s) + if not os.path.exists(sp): + sp = os.path.join(cmdpath, 'bup-%s' % s) + return sp if not os.path.exists(subpath(subcmd)): log('error: unknown command "%s"\n' % subcmd) -- 2.39.5