global-functions: $FetchUserAgentStr: add commit info in user agent string

... not side by side.

Makefile

@@ -9,7 +9,7 @@ MARKDOWN	:= $(wildcard *.md doc/*.md doc/mod/*.md)
 HTML		:= $(MARKDOWN:.md=.html)
 
 DATE		?= $(shell date --rfc-email)
-VERSION		?= $(shell git symbolic-ref --short HEAD 2>/dev/null)/$(shell git rev-list --count HEAD 2>/dev/null)/$(shell git rev-parse --short HEAD 2>/dev/null)
+VERSION		?= $(shell git symbolic-ref --short HEAD 2>/dev/null)/$(shell git rev-list --count HEAD 2>/dev/null)/$(shell git rev-parse --short=8 HEAD 2>/dev/null)
 export DATE VERSION
 
 .PHONY: all checksums docs rsc clean

contrib/html.sh

@@ -3,6 +3,7 @@
 set -e
 
 RELTO="$(dirname "${1}")"
+
 sed \
 	-e "s|__TITLE__|$(head -n1 "${1}")|" \
 	-e "s|__STYLE__|$(realpath --relative-to="${RELTO}" general/style.css)|" \
@@ -10,11 +11,13 @@ sed \
 	-e "s|__EWORM__|$(realpath --relative-to="${RELTO}" general/eworm-meadow.avif)|" \
 	-e "s|__QR_CODE__|$(realpath --relative-to="${RELTO}" general/qr-code.png)|" \
 	< "${0}.d/head.html"
+
 markdown -f toc,idanchor "${1}" | sed \
 	-e 's/href="\([-_\./[:alnum:]]*\)\.md\(#[-[:alnum:]]*\)\?"/href="\1.html\2"/g' \
 	-e '/<h[1234] /s| id="\(.*\)">| id="\L\1">|' \
 	-e '/<h[1234] /s|-2c-||g' -e '/<h[1234] /s|--26-amp-3b-||g' \
 	-e '/The above link may be broken on code hosting sites/s|blockquote|blockquote style="display: none;"|'
+
 sed \
 	-e "s|__DATE__|${DATE:-$(date --rfc-email)}|" \
 	-e "s|__VERSION__|${VERSION:-unknown}|" \

contrib/logo-color.html

@@ -37,9 +37,9 @@ something that differentiates? Color it!</p>
 <p>Then right-click, click "<i>Take Screenshot</i>" and finally select the
 logo and download it.</p>
 
-<p><img src="logo-color.d/browser-01.avif" width=533 height=482 alt="Screenshot Browser 01"></p>
-<p><img src="logo-color.d/browser-02.avif" width=533 height=482 alt="Screenshot Browser 02"></p>
-<p><img src="logo-color.d/browser-03.avif" width=533 height=482 alt="Screenshot Browser 03"></p>
+<p><img src="logo-color.d/browser-01.avif" alt="Screenshot Browser 01"></p>
+<p><img src="logo-color.d/browser-02.avif" alt="Screenshot Browser 02"></p>
+<p><img src="logo-color.d/browser-03.avif" alt="Screenshot Browser 03"></p>
 
 <p>(This example is with
 <a href="https://www.mozilla.org/de/firefox/new/">Firefox</a>. The workflow

contrib/template-capsman.sh

@@ -2,7 +2,10 @@
 
 set -e
 
-sed -e '/\/interface\/wifi\//d' -e '/\/interface\/wireless\//d' -e 's|%TEMPL%|.capsman|' \
+sed \
+	-e '/\/interface\/wifi\//d' \
+	-e '/\/interface\/wireless\//d' \
+	-e 's|%TEMPL%|.capsman|' \
 	-e '/^# NOT \/caps-man\/ #$/,/^# NOT \/caps-man\/ #$/d' \
 	-e '/^# !!/,/^# !!/c # !! Do not edit this file, it is generated from template!' \
 	< "${1}"

contrib/template-local.sh

@@ -2,7 +2,10 @@
 
 set -e
 
-sed -e '/\/caps-man\//d' -e '/\/interface\/wifi\//d' -e 's|%TEMPL%|.local|' \
+sed \
+	-e '/\/caps-man\//d' \
+	-e '/\/interface\/wifi\//d' \
+	-e 's|%TEMPL%|.local|' \
 	-e '/^# NOT \/interface\/wireless\/ #$/,/^# NOT \/interface\/wireless\/ #$/d' \
 	-e '/^# !!/,/^# !!/c # !! Do not edit this file, it is generated from template!' \
 	< "${1}"

contrib/template-wifi.sh

@@ -2,7 +2,10 @@
 
 set -e
 
-sed -e '/\/caps-man\//d' -e '/\/interface\/wireless\//d' -e 's|%TEMPL%|.wifi|' \
+sed \
+	-e '/\/caps-man\//d' \
+	-e '/\/interface\/wireless\//d' \
+	-e 's|%TEMPL%|.wifi|' \
 	-e '/^# NOT \/interface\/wifi\/ #$/,/^# NOT \/interface\/wifi\/ #$/d' \
 	-e '/^# !!/,/^# !!/c # !! Do not edit this file, it is generated from template!' \
 	< "${1}"

global-functions.rsc

@@ -539,10 +539,16 @@
 :set FetchUserAgentStr do={
   :local Caller [ :tostr $1 ];
 
+  :global CommitId;
+  :global CommitInfo;
+
+  :global IfThenElse;
+
   :local Resource [ /system/resource/get ];
 
-  :return ("User-Agent: Mikrotik/" . $Resource->"version" . " " . \
-    $Resource->"architecture-name" . " " . $Caller . "/Fetch (https://rsc.eworm.de/)");
+  :return ("User-Agent: Mikrotik/" . $Resource->"version" . " " . $Resource->"architecture-name" . \
+    " " . $Caller . "/Fetch (https://rsc.eworm.de/" . [ $IfThenElse ($CommitId != "unknown") \
+    ("; " . $CommitInfo . "/" . [ :pick $CommitId 0 8 ]) ] . ")");
 }
 
 # check for existence of file, optionally with type