diff -urP mkws/1.0/mkws/LICENSE mkws/1.0.1/mkws/LICENSE
--- mkws/1.0/mkws/LICENSE Sat Jun 27 14:03:48 2020
+++ mkws/1.0.1/mkws/LICENSE Fri Jul 10 23:15:06 2020
@@ -1,6 +1,6 @@
ISC License
-Copyright (c) 2019, Adrian Emil Grigore <adi@tilde.institute>
+Copyright (c) 2020, Adrian Emil Grigore <adi@tilde.institute>
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
diff -urP mkws/1.0/mkws/README mkws/1.0.1/mkws/README
--- mkws/1.0/mkws/README Sat Jun 27 14:03:48 2020
+++ mkws/1.0.1/mkws/README Fri Jul 10 23:15:06 2020
@@ -4,7 +4,6 @@
A UNIX like operating system is recommended like
[macOS](https://www.apple.com/macos/),
-[GNU](https://gnu.org)/
[Linux](https://kernel.org) or
[BSD](https://en.wikipedia.org/wiki/List_of_BSD_operating_systems)
variant (our favorites are [OpenBSD](https://openbsd.org) and
@@ -12,24 +11,18 @@
Also, familiarity with the command line is good to have.
`mkws(1)` can also run on [Windows](https://www.microsoft.com/windows)
via the
-[Windows Subsystem for Linux]
-(https://docs.microsoft.com/en-us/windows/wsl/install-win10).
+[Windows Subsystem for Linux](
+https://docs.microsoft.com/en-us/windows/wsl/install-win10).
-## Installation
+## Installation (applies to [Linux](https://kernel.org))
-You'll have to get the archive from either
-[https://mkws.sh/mkws-linux@1.0.tgz]
-(https://mkws.sh/mkws-linux@1.0.tgz)
-or
-[https://mkws.sh/mkws-openbsd@1.0.tgz]
-(https://mkws.sh/mkws-openbsd@1.0.tgz)
-depending on your operating system. Once you have the archive, assuming
-you downloaded the [GNU](https://gnu.org)/[Linux](https://kernel.org)
-version, unpack it and rename the newly created directory:
+You'll have to download [https://mkws.sh/mkws@1.0.1.tgz](
+https://mkws.sh/mkws@1.0.1.tgz). Once you have the archive, unpack
+it and rename the newly created directory:
mkdir -p ~/src/
cd ~/src/
- tar -xzfv ~/Downloads/mkws-linux@1.0.tgz
+ tar -xzfv ~/Downloads/mkws@1.0.1.tgz
mv ws.sh example.com
## Make web site
@@ -47,21 +40,7 @@
EOF
./bin/mkws https://example.com
-You can create more `*.upphtml` files to make additional pages. You can
-edit the `./share/l.upphtml` file to create a set of navigation links:
-
- <nav>
- <ul>
- <li>
- <a href=/>Home</a>
- </li>
- <li>
- <a href=about.html>About</a>
- </li>
- <li>
- <a href=contact.html>Contact</a>
- </li>
- </ul>
- </nav>
+You can create more `*.upphtml` files to make additional pages, the
+layout file is held in `./share/l.upphtml`.
Also, you can always modify your `./bin/mkws` script, if it's the case.
diff -urP mkws/1.0/mkws/mkws mkws/1.0.1/mkws/mkws
--- mkws/1.0/mkws/mkws Sat Jun 27 14:03:48 2020
+++ mkws/1.0.1/mkws/mkws Fri Jul 10 23:15:06 2020
@@ -8,27 +8,27 @@
test $# -lt 1 && usage
srcdir=${2:-.}
-shareddir=${MKWSTHEMEDIR:-"$srcdir"/share}
+sharedir=${MKWSTHEMEDIR:-"$srcdir"/share}
LANG=${LANG:-en_US.UTF-8}
-if ! test -f $srcdir/index.upphtml
+if ! test -f "$srcdir"/index.upphtml
then
>&2 printf "no index.upphtml file found\n"
exit 1
fi
echo "Making theme.css"
-pp "$shareddir"/theme.uppcss "$1" > theme.css
+pp "$sharedir"/theme.uppcss "$1" > theme.css
-for t in $srcdir/*.upphtml
+for t in "$srcdir"/*.upphtml
do
- echo "Making $(basename ${t%.upphtml}.html)"
- pp "$shareddir"/l.upphtml "$t" "$1" > \
- "$(basename ${t%.upphtml}.html)"
+ echo "Making $(basename "${t%.upphtml}".html)"
+ pp "$sharedir"/l.upphtml "$t" "$1" > \
+ "$(basename "${t%.upphtml}".html)"
done
echo "Making sitemap.xml"
-pp "$shareddir"/sitemap.uppxml "$1" > sitemap.xml
+pp "$sharedir"/sitemap.uppxml "$1" > sitemap.xml
echo "Making robots.txt"
-pp "$shareddir"/robots.upptxt "$1" > robots.txt
+pp "$sharedir"/robots.upptxt "$1" > robots.txt