Re-organize files

45 files changed, 20 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 9b1b071..f8d23b4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,10 @@
-EXEC != find -H . -follow -type f -maxdepth 1 -perm -111
-IEXEC != echo " $(EXEC)" | sed -E 's, \./, /usr/local/bin/,g'
+EXEC != find -H . -follow -type f -perm -111 ! -path '*/.git/*'
+IEXEC != echo " $(EXEC)" | sed -E 's, \./([^ ]*/)?, /usr/local/bin/,g'
 
 install:
-	install -m 644 *.[1-9] /usr/local/man/man1
-	install $(EXEC) /usr/local/bin
-	re! $(IEXEC)
+	@echo Installing man pages...
+	@install -m 644 doc/*.[1-9] /usr/local/man/man1
+	@echo Installing executables...
+	@install $(EXEC) /usr/local/bin
+	@echo Rewriting shebangs...
+	@re! $(IEXEC)
diff --git a/README b/README
index 47299fe..108287a 100644
--- a/README
+++ b/README
@@ -3,14 +3,18 @@ idiosyncratic extra UNIX tools.
 
 In my opinion, the most generally useful ones are
 
-	ce	center text
-	ep	edit pipe
-	g	poor man's ack
-	inc	increment numbers in lines
-	p/P	maybe view output in pager
+etc/
+	ce		center text
+	ep		edit pipe
+	g		poor man's ack
+	inc		increment numbers in lines
+	p/P		maybe view output in pager
+
+git/
+	git-orig	checkout original file
 
 For similar programs, see
 
-	dwim	http://git.ankarstrom.se/dwim
-	repl	http://git.ankarstrom.se/repl
-	vp	http://git.ankarstrom.se/vp
+	dwim		http://git.ankarstrom.se/dwim
+	repl		http://git.ankarstrom.se/repl
+	vp		http://git.ankarstrom.se/vp
diff --git a/cpy.1 b/doc/cpy.1
index 3b23b8b..3b23b8b 100644
--- a/cpy.1
+++ b/doc/cpy.1
diff --git a/ep.1 b/doc/ep.1
index 95e992d..95e992d 100644
--- a/ep.1
+++ b/doc/ep.1
diff --git a/f.1 b/doc/f.1
index 104ebae..104ebae 100644
--- a/f.1
+++ b/doc/f.1
diff --git a/mkmv.1 b/doc/mkmv.1
index 7087769..7087769 100644
--- a/mkmv.1
+++ b/doc/mkmv.1
diff --git a/ord.1 b/doc/ord.1
index 9ab54a5..9ab54a5 100644
--- a/ord.1
+++ b/doc/ord.1
diff --git a/pst.1 b/doc/pst.1
index 0ececb2..0ececb2 120000
--- a/pst.1
+++ b/doc/pst.1
diff --git a/P b/etc/P
index 3c11b20..3c11b20 100755
--- a/P
+++ b/etc/P
diff --git a/ce b/etc/ce
index c00d1bf..c00d1bf 100755
--- a/ce
+++ b/etc/ce
diff --git a/child b/etc/child
index 32dab60..32dab60 100755
--- a/child
+++ b/etc/child
diff --git a/colortest b/etc/colortest
index 24aa95c..24aa95c 100755
--- a/colortest
+++ b/etc/colortest
diff --git a/cpy b/etc/cpy
index 827d21c..827d21c 100755
--- a/cpy
+++ b/etc/cpy
diff --git a/cuthere b/etc/cuthere
index 01c1606..01c1606 100755
--- a/cuthere
+++ b/etc/cuthere
diff --git a/ep b/etc/ep
index 4be6317..4be6317 100755
--- a/ep
+++ b/etc/ep
diff --git a/f b/etc/f
index 7f541d8..7f541d8 100755
--- a/f
+++ b/etc/f
diff --git a/flip b/etc/flip
index 614bc67..614bc67 100755
--- a/flip
+++ b/etc/flip
diff --git a/g b/etc/g
index 7c55707..7c55707 100755
--- a/g
+++ b/etc/g
diff --git a/gspell b/etc/gspell
index e931f3c..e931f3c 100755
--- a/gspell
+++ b/etc/gspell
diff --git a/imgur b/etc/imgur
index f459fc3..f459fc3 100644
--- a/imgur
+++ b/etc/imgur
diff --git a/inc b/etc/inc
index 51345a5..51345a5 100755
--- a/inc
+++ b/etc/inc
diff --git a/isort b/etc/isort
index eecde11..eecde11 100755
--- a/isort
+++ b/etc/isort
diff --git a/lorem b/etc/lorem
index 3dc7042..3dc7042 100755
--- a/lorem
+++ b/etc/lorem
diff --git a/mkmv b/etc/mkmv
index 0179bbc..0179bbc 100755
--- a/mkmv
+++ b/etc/mkmv
diff --git a/ord b/etc/ord
index cea4907..cea4907 100755
--- a/ord
+++ b/etc/ord
diff --git a/p b/etc/p
index b145031..b145031 100755
--- a/p
+++ b/etc/p
diff --git a/pst b/etc/pst
index dd6bd64..dd6bd64 100755
--- a/pst
+++ b/etc/pst
diff --git a/re! b/etc/re!
index 1314ae9..1314ae9 100755
--- a/re!
+++ b/etc/re!
diff --git a/wpdf b/etc/wpdf
index 94e5029..94e5029 100755
--- a/wpdf
+++ b/etc/wpdf
diff --git a/xtopen b/etc/xtopen
index ccda2e5..ccda2e5 100755
--- a/xtopen
+++ b/etc/xtopen
diff --git a/git-bdiff b/git/git-bdiff
index 9b39ad4..9b39ad4 100755
--- a/git-bdiff
+++ b/git/git-bdiff
diff --git a/git-orig b/git/git-orig
index a792390..a792390 100755
--- a/git-orig
+++ b/git/git-orig
diff --git a/git-s b/git/git-s
index faf55ff..faf55ff 100755
--- a/git-s
+++ b/git/git-s
diff --git a/git-st b/git/git-st
index 8edae3f..8edae3f 100755
--- a/git-st
+++ b/git/git-st
diff --git a/pl b/pl/pl
index a331623..a331623 100755
--- a/pl
+++ b/pl/pl
diff --git a/pla b/pl/pla
index 55239f3..55239f3 120000
--- a/pla
+++ b/pl/pla
diff --git a/plf b/pl/plf
index 55239f3..55239f3 120000
--- a/plf
+++ b/pl/plf
diff --git a/plh b/pl/plh
index 55239f3..55239f3 120000
--- a/plh
+++ b/pl/plh
diff --git a/plm b/pl/plm
index 55239f3..55239f3 120000
--- a/plm
+++ b/pl/plm
diff --git a/plq b/pl/plq
index 55239f3..55239f3 120000
--- a/plq
+++ b/pl/plq
diff --git a/plv b/pl/plv
index 55239f3..55239f3 120000
--- a/plv
+++ b/pl/plv
diff --git a/with-git b/with/with-git
index 8952a82..8952a82 100755
--- a/with-git
+++ b/with/with-git
diff --git a/with-pager b/with/with-pager
index 10f8717..10f8717 100755
--- a/with-pager
+++ b/with/with-pager
diff --git a/with-shell b/with/with-shell
index 364d2ac..364d2ac 100755
--- a/with-shell
+++ b/with/with-shell
diff --git a/with-shell-on-error b/with/with-shell-on-error
index d29a1d6..d29a1d6 100755
--- a/with-shell-on-error
+++ b/with/with-shell-on-error