summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/conf13
-rwxr-xr-xsrc/indexentry2
2 files changed, 10 insertions, 5 deletions
diff --git a/src/conf b/src/conf
index 5d879fd..fa753e9 100755
--- a/src/conf
+++ b/src/conf
@@ -139,17 +139,23 @@ UNPREFIXED="${FILENAME#$root_dir/}"
cat -- "$CONF"
+url="$(printf '%s\n' "${UNPREFIXED%.adoc}.html" | shesc)"
+
+collurl=
date_iso=
date_formatted=
updatedat_iso=
updatedat_formatted=
if is_article; then
- date_iso="$(dateiso "$(last3dirnames)" | shesc)"
- date_formatted="$(datefmt "$date_iso" | shesc)"
+ lastdirnames="$(last3dirnames)"
+ date_iso="$(dateiso "$lastdirnames" | shesc)"
+ date_formatted="$(datefmt "$date_iso" | shesc)"
if [ -n "${updatedat:-}" ]; then
updatedat_iso="$(dateiso "$updatedat" | shesc)"
updatedat_formatted="$(datefmt "$updatedat_iso" | shesc)"
fi
+ file="$(basename "$url")"
+ collurl="$(printf '%s\n' "$lastdirnames" | sed 's|-|/|g' | shesc)/$file"
fi
BASE_URL="$(base_url)"
@@ -188,8 +194,6 @@ title_uri="$(printf '%s' "$TITLE_RAW" | uri)"
comment_url="$(printf 'mailto:%s?Subject=Re%%3A%%20%s\n' "$list_addr" "$title_uri" | shesc)"
discussions_url="$(printf '%s%s\n' "$discussions_url_prefix" "$title_uri" | shesc)"
-url="$(printf '%s\n' "${UNPREFIXED%.adoc}.html" | shesc)"
-
css_url="$( printf '%s\n' "$css_url" | shesc)"
feed_url="$( printf '%s\n' "$feed_url" | shesc)"
feedicon_url="$( printf '%s\n' "$feedicon_url" | shesc)"
@@ -215,6 +219,7 @@ cat <<-EOF
export source_path="$source_path"
export publickey_url="$base_url_prefix/${publickey_url:-}"
export url="$url"
+ export collurl="$collurl"
export url_absolute="$url_pre/$url"
export base_url_prefix="$base_url_prefix"
export title="$title"
diff --git a/src/indexentry b/src/indexentry
index 07ffa4a..6b5af5b 100755
--- a/src/indexentry
+++ b/src/indexentry
@@ -15,6 +15,6 @@ cat <<EOF
<li>
$date_formatted
<br />
- <a href="$url">$title_html</a>
+ <a href="$collurl">$title_html</a>
</li>
EOF