чување 84d65cb5c230227044200e1266e4b5158ca69120
родитељ 4ed6157298ad191253c3cf001c2af8028f873858
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Tue, 29 Dec 2020 13:03:06 +0100
Updated README and index.slw to reflect switch to redo
Signed-off-by: Страхиња Радић <contact@strahinja.org>
Diffstat:
измењених датотека: 3, додавања: 53(+), брисања: 20(-)
diff --git a/README b/README
@@ -9,9 +9,10 @@ transforms custom Markdown-like syntax into HTML.
Prerequisites
-------------
-Aside from the obvious (GCC and GNU make), slweb requires groff(1) and gzip(1)
-to create and compress documentation. git(1) is, aside from cloning the
-repository, required to use the directive {git-log}.
+Aside from the obvious (GCC), slweb requires realpath(1) to determine paths in
+local links and groff(1) and gzip(1) to create and compress documentation.
+git(1) is, aside from cloning the repository, required to use the directive
+{git-log}.
Install
@@ -19,11 +20,18 @@ repository, required to use the directive {git-log}.
$ git clone https://github.com/Strahinja/slweb.git
$ cd slweb
-$ make && doas make install
-or with sudo(1):
+ Then, if you have djb redo:
-$ make && sudo make install
+$ doas redo install
+
+ if you don't:
+
+$ doas ./do install
+
+ or with sudo(1) instead of doas(1):
+
+$ sudo ./do install
Examples
diff --git a/index.html b/index.html
@@ -17,22 +17,34 @@ transforms custom Markdown-like syntax into HTML.</p>
<h2>Prerequisites</h2>
-<p>Aside from the obvious (<strong>GCC</strong> and <strong>GNU make</strong>), slweb requires
-<strong>realpath</strong>(1) to determine paths in local links and <strong>groff</strong>(1) and
-<strong>gzip</strong>(1) to create and compress documentation. <strong>git</strong>(1) is, aside from
-cloning the repository, required to use the directive <code>{git-log}</code>.</p>
+<p>Aside from the obvious (<strong>GCC</strong>), slweb requires <strong>realpath</strong>(1) to determine
+paths in local links and <strong>groff</strong>(1) and <strong>gzip</strong>(1) to create and compress
+documentation. <strong>git</strong>(1) is, aside from cloning the repository, required to use
+the directive <code>{git-log}</code>.</p>
<h2>Install</h2>
<pre>
$ git clone https://github.com/Strahinja/slweb.git
$ cd slweb
-$ make && <a href="https://github.com/slicer69/doas">doas</a> make install
</pre>
-or with <strong>sudo</strong>(1):
+
+<p>Then, if you have <a href="https://github.com/apenwarr/redo">apenwarr/redo</a>:</p>
+
+<pre>
+$ doas redo install
+</pre>
+
+<p>if you don't:</p>
+
+<pre>
+$ doas ./do install
+</pre>
+
+<p>or with <strong>sudo</strong>(1):</p>
<pre>
-$ make && sudo make install
+$ sudo ./do install
</pre>
<h2>Examples</h2>
@@ -115,7 +127,7 @@ this program. If not, see <<a href="https://www.gnu.org/licenses">https://www
<div id="git-log">
Previous commit:
-index.slw 49a47b4 2020-12-29 12:46:17 +0100 (Страхиња Радић) (HEAD -> redo-instead-of-make)
+index.slw 4ed6157 2020-12-29 12:48:34 +0100 (Страхиња Радић) (HEAD -> master, origin/redo-instead-of-make, origin/master, origin/HEAD, redo-instead-of-make)
</div><!--git-log-->
diff --git a/index.slw b/index.slw
@@ -11,22 +11,34 @@ transforms custom Markdown-like syntax into HTML.
## Prerequisites
-Aside from the obvious (**GCC** and **GNU make**), slweb requires
-**realpath**(1) to determine paths in local links and **groff**(1) and
-**gzip**(1) to create and compress documentation. **git**(1) is, aside from
-cloning the repository, required to use the directive `{git-log}`.
+Aside from the obvious (**GCC**), slweb requires **realpath**(1) to determine
+paths in local links and **groff**(1) and **gzip**(1) to create and compress
+documentation. **git**(1) is, aside from cloning the repository, required to use
+the directive `{git-log}`.
## Install
```
$ git clone https://github.com/Strahinja/slweb.git
$ cd slweb
-$ make && <a href="https://github.com/slicer69/doas">doas</a> make install
```
+
+Then, if you have [apenwarr/redo][5]:
+
+```
+$ doas redo install
+```
+
+if you don't:
+
+```
+$ doas ./do install
+```
+
or with **sudo**(1):
```
-$ make && sudo make install
+$ sudo ./do install
```
## Examples
@@ -116,4 +128,5 @@ this program. If not, see <[https://www.gnu.org/licenses/][4]>.
[2]: https://github.com/Strahinja/slweb/tree/master/TODO
[3]: https://github.com/Strahinja/slweb/issues
[4]: https://www.gnu.org/licenses
+[5]: https://github.com/apenwarr/redo
