diff options
author | Andrew Cady <d@cryptonomic.net> | 2021-10-23 12:50:01 -0400 |
---|---|---|
committer | Andrew Cady <d@cryptonomic.net> | 2021-10-23 12:52:03 -0400 |
commit | 4d14156fd5b306b366b4d74e1a5bbf82e0ae081a (patch) | |
tree | 47fd2acdded79df2631b6780108fad2e73b547e0 | |
parent | d62afec285253371c975f95366e5bf110ff2a3ff (diff) |
launch documentation by default
-rw-r--r-- | Makefile | 7 | ||||
-rw-r--r-- | README.md | 8 | ||||
-rw-r--r-- | test/tests.sh | 2 |
3 files changed, 11 insertions, 6 deletions
@@ -13,8 +13,13 @@ SSHD_CONFIG_DIR = $(SSH_CONFIG_DIR)/sshd_config.d | |||
13 | SSH_LIB_DIR = /usr/lib/ssh | 13 | SSH_LIB_DIR = /usr/lib/ssh |
14 | USER_SSH_CONFIG_DIR = ~$(USER)/.ssh | 14 | USER_SSH_CONFIG_DIR = ~$(USER)/.ssh |
15 | 15 | ||
16 | BROWSER != 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 | ||
20 | doc: README.html | ||
21 | $(BROWSER) $< | ||
22 | |||
18 | shared: install | 23 | shared: 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 | ||
31 | doc: README.html | ||
32 | |||
33 | README.html: README.md | 36 | README.html: README.md |
34 | pandoc -t html $< > $@ | 37 | pandoc -t html $< > $@ |
35 | 38 | ||
@@ -50,7 +50,7 @@ HOW TO INSTALL | |||
50 | 50 | ||
51 | Run: | 51 | Run: |
52 | ``` | 52 | ``` |
53 | make | 53 | make install |
54 | ``` | 54 | ``` |
55 | 55 | ||
56 | This installs the `AnonymousAccessCommand` in the current user's home | 56 | This 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 | ||
79 | Then you will need to run `OpenSSH` on a non-default port (the default | 80 | Then 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 | ||
97 | First you would have to make the contents of the installed file | 99 | First 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" | |||
45 | git clone -v ${USER}@${HOST}:${DIR} | 45 | git clone -v ${USER}@${HOST}:${DIR} |
46 | cd anonymous-ssh | 46 | cd anonymous-ssh |
47 | 47 | ||
48 | make | 48 | make install |
49 | 49 | ||
50 | git pull --ff-only | 50 | git pull --ff-only |
51 | make_test_commit | 51 | make_test_commit |