summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@cryptonomic.net>2021-10-23 12:50:01 -0400
committerAndrew Cady <d@cryptonomic.net>2021-10-23 12:52:03 -0400
commit4d14156fd5b306b366b4d74e1a5bbf82e0ae081a (patch)
tree47fd2acdded79df2631b6780108fad2e73b547e0
parentd62afec285253371c975f95366e5bf110ff2a3ff (diff)
launch documentation by default
-rw-r--r--Makefile7
-rw-r--r--README.md8
-rw-r--r--test/tests.sh2
3 files changed, 11 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index d3346ed..2501da9 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,13 @@ SSHD_CONFIG_DIR = $(SSH_CONFIG_DIR)/sshd_config.d
13SSH_LIB_DIR = /usr/lib/ssh 13SSH_LIB_DIR = /usr/lib/ssh
14USER_SSH_CONFIG_DIR = ~$(USER)/.ssh 14USER_SSH_CONFIG_DIR = ~$(USER)/.ssh
15 15
16BROWSER != 2>/dev/null which xdg-open || which w3m || which links || which elinks
17
16.PHONY: install shared doc test 18.PHONY: install shared doc test
17 19
20doc: README.html
21 $(BROWSER) $<
22
18shared: install 23shared: install
19 git config core.self-forge true 24 git config core.self-forge true
20 25
@@ -28,8 +33,6 @@ install:
28 $(ROOT_INSTALL) -t "$(SSH_LIB_DIR)" $(SRC)/AuthorizedKeysCommand || true 33 $(ROOT_INSTALL) -t "$(SSH_LIB_DIR)" $(SRC)/AuthorizedKeysCommand || true
29 [ -e "$(SSH_LIB_DIR)"/AuthorizedKeysCommand ] || $(SUDO) ln -s -t /etc/ssh "$(SSH_LIB_DIR)"/AuthorizedKeysCommand 34 [ -e "$(SSH_LIB_DIR)"/AuthorizedKeysCommand ] || $(SUDO) ln -s -t /etc/ssh "$(SSH_LIB_DIR)"/AuthorizedKeysCommand
30 35
31doc: README.html
32
33README.html: README.md 36README.html: README.md
34 pandoc -t html $< > $@ 37 pandoc -t html $< > $@
35 38
diff --git a/README.md b/README.md
index 015e545..b2935b8 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ HOW TO INSTALL
50 50
51Run: 51Run:
52``` 52```
53 make 53 make install
54``` 54```
55 55
56This installs the `AnonymousAccessCommand` in the current user's home 56This installs the `AnonymousAccessCommand` in the current user's home
@@ -73,7 +73,8 @@ location:
73``` 73```
74 make SSH_CONFIG_DIR=.config/ssh \ 74 make SSH_CONFIG_DIR=.config/ssh \
75 SSHD_CONFIG_DIR=.config/ssh/config.d \ 75 SSHD_CONFIG_DIR=.config/ssh/config.d \
76 SSH_LIB_DIR=.local/lib/ssh 76 SSH_LIB_DIR=.local/lib/ssh \
77 install
77``` 78```
78 79
79Then you will need to run `OpenSSH` on a non-default port (the default 80Then you will need to run `OpenSSH` on a non-default port (the default
@@ -91,7 +92,8 @@ It is also possible to choose the location of the
91`AnonymousAccessCommand` itself: 92`AnonymousAccessCommand` itself:
92 93
93``` 94```
94 make USER_SSH_CONFIG_DIR=$HOME/.config/ssh 95 make USER_SSH_CONFIG_DIR=$HOME/.config/ssh \
96 install
95``` 97```
96 98
97First you would have to make the contents of the installed file 99First you would have to make the contents of the installed file
diff --git a/test/tests.sh b/test/tests.sh
index 5d221b6..37f819f 100644
--- a/test/tests.sh
+++ b/test/tests.sh
@@ -45,7 +45,7 @@ export GIT_SSH_COMMAND="ssh -o NoHostAuthenticationForLocalhost=yes -i $SSH_ID"
45git clone -v ${USER}@${HOST}:${DIR} 45git clone -v ${USER}@${HOST}:${DIR}
46cd anonymous-ssh 46cd anonymous-ssh
47 47
48make 48make install
49 49
50git pull --ff-only 50git pull --ff-only
51make_test_commit 51make_test_commit