From 684d4fcd950d3164c9fac75d89d504b251dffe74 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 2 Sep 2022 12:05:06 -0300 Subject: Make `url-for` and `absolute` standalone executables --- v2/src/bin/absolute | 67 +++++++++++++++++++++++++++++++++++++ v2/src/bin/url-for | 77 +++++++++++++++++++++++++++++++++++++++++++ v2/src/development/genhtml.sh | 31 +++++++---------- 3 files changed, 155 insertions(+), 20 deletions(-) create mode 100755 v2/src/bin/absolute create mode 100755 v2/src/bin/url-for (limited to 'v2/src') diff --git a/v2/src/bin/absolute b/v2/src/bin/absolute new file mode 100755 index 0000000..ae25b43 --- /dev/null +++ b/v2/src/bin/absolute @@ -0,0 +1,67 @@ +#!/bin/sh +set -eu + + +usage() { + cat <<-'EOF' + Usage: + absolute < STDIN + absolute -h + EOF +} + +help() { + cat <<-'EOF' + + Options: + -h, --help show this message + + + Read URL from STDIN and adds the FQDN prefix. Meant to be used + in conjunction with `url-for`. + + + Examples: + + Get the URL for "static/style.css", and make it absolute: + + $ url-for 'static/style.css' | absolute + https://euandre.org/static/style.css + EOF +} + + +for flag in "$@"; do + case "$flag" in + --) + break + ;; + --help) + usage + help + exit + ;; + *) + ;; + esac +done + +while getopts 'h' flag; do + case "$flag" in + h) + usage + help + exit + ;; + *) + usage >&2 + exit 2 + ;; + esac +done +shift $((OPTIND - 1)) + + +. src/development/config.env + +printf 'https://%s%s' "$FQDN" "$(cat)" diff --git a/v2/src/bin/url-for b/v2/src/bin/url-for new file mode 100755 index 0000000..025a546 --- /dev/null +++ b/v2/src/bin/url-for @@ -0,0 +1,77 @@ +#!/bin/sh +set -eu + + +usage() { + cat <<-'EOF' + Usage: + url-for FILE + url-for -h + EOF +} + +help() { + cat <<-'EOF' + + Options: + -h, --help show this message + + FILE the path for the URL to be constructed + + + Build an URL for the given FILE, without the FQDN part, adding + the required BASE_URL. + + + Examples: + + Get the URL for "static/style.css", when BASE_URL is empty: + + $ url-for 'static/style.css' + /static/style.css + + + Get the URL for "static/favicon.svg", when BASE_URL is "v2": + + $ url-for 'static/favicon.svg' + /v2/static/favicon.svg + EOF +} + + +for flag in "$@"; do + case "$flag" in + --) + break + ;; + --help) + usage + help + exit + ;; + *) + ;; + esac +done + +while getopts 'h' flag; do + case "$flag" in + h) + usage + help + exit + ;; + *) + usage >&2 + exit 2 + ;; + esac +done +shift $((OPTIND - 1)) + +FILE="${1:-}" +eval "$(assert-arg "$FILE" 'FILE')" + +. src/development/config.env + +printf '%s/%s' "$BASE_URL" "$FILE" diff --git a/v2/src/development/genhtml.sh b/v2/src/development/genhtml.sh index 953a80d..3f1bca6 100755 --- a/v2/src/development/genhtml.sh +++ b/v2/src/development/genhtml.sh @@ -12,7 +12,6 @@ set -eu # - sitemap? How does it even work? # - dark mode # - generate security.txt dynamically -# - make url_for a standalone executable # - config.env should depend on dynamic.mk? @@ -91,14 +90,6 @@ eval "$(assert-arg "$FILENAME" 'FILENAME')" # Utility functions # -url_for() { - printf '%s/%s' "$BASE_URL" "$1" -} - -absolute() { - printf 'https://%s%s' "$FQDN" "$(cat)" -} - translate() { printf '%s' "$1" } @@ -166,7 +157,7 @@ extract_plaintext_snippets() { printf '%s\n' "$line" if [ "$line" = '' ]; then - printf '

plaintext

\n' "$(url_for "$URL")" "$BLOCK_NUMBER" + printf '

plaintext

\n' "$(url-for "$URL")" "$BLOCK_NUMBER" BLOCK_NUMBER=$((BLOCK_NUMBER + 1)) fi done < "$F" @@ -218,7 +209,7 @@ add_headings_anchors() { "$SLUG" \ "$HEADING" \ "$SLUG" \ - "$(url_for 'static/link.svg')" \ + "$(url-for 'static/link.svg')" \ "$LVL" done ) @@ -275,8 +266,8 @@ cat <<-EOF - - + + $TITLE @@ -285,15 +276,15 @@ cat <<-EOF - - + +
@@ -315,12 +306,12 @@ cat <<-EOF

-- cgit v1.2.3