about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2018-09-10 17:44:23 -0400
committerJune McEnroe <june@causal.agency>2018-09-10 17:44:23 -0400
commitc9968aadb959aeee1e999880089a9b6d923a6f26 (patch)
tree33a35c8b7a900ff971c21f9a7c7cf1258b514204
parentInstall man page (diff)
downloadcatgirl-c9968aadb959aeee1e999880089a9b6d923a6f26.tar.gz
catgirl-c9968aadb959aeee1e999880089a9b6d923a6f26.zip
Install man page in chroot
Diffstat (limited to '')
-rw-r--r--Makefile18
-rw-r--r--README1
-rw-r--r--man.sh2
3 files changed, 12 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 18aa828..f0dcebf 100644
--- a/Makefile
+++ b/Makefile
@@ -42,19 +42,17 @@ uninstall:
 	rm -f $(PREFIX)/bin/chatte
 	rm -f $(MANPATH)/man1/chatte.1
 
-chroot.tar: chatte
-	mkdir -p root
+chroot.tar: chatte chatte.1
 	install -d -o root -g wheel \
+		root \
 		root/bin \
 		root/etc \
 		root/home \
 		root/lib \
 		root/libexec \
-		root/usr \
-		root/usr/local \
-		root/usr/local/etc \
+		root/usr/bin \
 		root/usr/local/etc/ssl \
-		root/usr/share \
+		root/usr/share/man \
 		root/usr/share/misc
 	install -d -o $(CHROOT_USER) -g $(CHROOT_GROUP) root/home/$(CHROOT_USER)
 	cp -p -f /libexec/ld-elf.so.1 root/libexec
@@ -63,6 +61,7 @@ chroot.tar: chatte
 	    /lib/libedit.so.7 \
 		/lib/libncursesw.so.8 \
 		/lib/libthr.so.3 \
+		/lib/libz.so.6 \
 		/usr/local/lib/libcrypto.so.43 \
 		/usr/local/lib/libssl.so.45 \
 		/usr/local/lib/libtls.so.17 \
@@ -71,9 +70,10 @@ chroot.tar: chatte
 	cp -p -f /usr/local/etc/ssl/cert.pem root/usr/local/etc/ssl
 	cp -a -f /usr/share/locale root/usr/share
 	cp -p -f /usr/share/misc/termcap.db root/usr/share/misc
-	cp -p -f /bin/sh root/bin
-	install -o root -g wheel -m 555 chatte root/bin
+	cp -p -f /bin/sh /usr/bin/mandoc /usr/bin/less root/bin
+	$(MAKE) install PREFIX=root/usr
+	install man.sh root/usr/bin/man
 	tar -c -f chroot.tar -C root bin etc home lib libexec usr
 
 clean:
-	rm -f tags chatte $(OBJS) chroot.tar
+	rm -rf tags chatte $(OBJS) root chroot.tar
diff --git a/README b/README
index 9c86694..a50bf31 100644
--- a/README
+++ b/README
@@ -17,3 +17,4 @@ This software requires LibreSSL and targets FreeBSD and Darwin.
 	pls.c       Functions which should not have to be written
 
 	sshd_config    Sample anonymous SSH configuration
+	man.sh         man(1) implementation for chroot
diff --git a/man.sh b/man.sh
new file mode 100644
index 0000000..b079c90
--- /dev/null
+++ b/man.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec mandoc /usr/share/man/man1/chatte.1 | less
>2021-09-21Rewrite pngo, add explicit optionsJune McEnroe Interesting to see how my code habits have changed. 2021-09-16Fix /* **/ comment matchingJune McEnroe 2021-09-15Remove typer, add downgrade to READMEJune McEnroe 2021-09-15Set bot mode on downgradeJune McEnroe 2021-09-15Enter capsicum in downgradeJune McEnroe 2021-09-15Factor out common parts of downgrade messagesJune McEnroe Also bump the message cap to 1024 because that is ostensibly useful for replying to older messages. 2021-09-14Add downgrade IRC botJune McEnroe 2021-09-14Sort by title if authors matchJune McEnroe There are probably better things to sort by but title definitely always exists. 2021-09-13Swap-remove tags as they're foundJune McEnroe This makes it even faster. From ~1s on a sqlite3.c amalgamation to ~0.85s. 2021-09-12Replace htagml regex with strncmpJune McEnroe Since ctags only ever produces regular expressions of the form /^re$/ or /^re/ with no other special characters, instead unescape the pattern and simply use strncmp. Running on a sqlite3.c amalgamation, the regex version takes ~37s while the strncmp version takes ~1s, producing identical output. Big win! 2021-09-11Also defer printing comment for lone close-parensJune McEnroe 2021-09-10Publish "git-comment"June McEnroe 2021-09-10Add git comment --pretty optionJune McEnroe 2021-09-08Defer printing comment if line is blank or closing braceJune McEnroe This fixes badly indented comments. 2021-09-08Up default min-repeat to 30 linesJune McEnroe 2021-09-08Handle dirty lines in git-commentJune McEnroe 2021-09-08Document and install git-commentJune McEnroe 2021-09-08Add repeat and all options to git-commentJune McEnroe 2021-09-08Add group threshold to git-commentJune McEnroe