fw-addr-lists.d/allow: use rsc.eworm.de in the list

... but not both.

.gitignore

@@ -7,6 +7,7 @@
 *.rej
 
 # html files (as generated from markdown)
+style.css
 *.html
 
 # checksums file as used by $ScriptInstallUpdate

Makefile

@@ -2,18 +2,31 @@
 #  template scripts -> final scripts
 #  markdown files -> html files
 
-CAPSMAN = $(wildcard *.capsman.rsc)
-LOCAL = $(wildcard *.local.rsc)
-WIFI = $(wildcard *.wifi.rsc)
+ALL_RSC		:= $(wildcard *.rsc */*.rsc)
+GEN_RSC		:= $(wildcard *.capsman.rsc *.local.rsc *.wifi.rsc)
 
-MARKDOWN = $(wildcard *.md doc/*.md doc/mod/*.md)
-HTML = $(MARKDOWN:.md=.html)
+MARKDOWN	:= $(wildcard *.md doc/*.md doc/mod/*.md)
+HTML		:= $(MARKDOWN:.md=.html) style.css
 
-all: $(CAPSMAN) $(LOCAL) $(WIFI) $(HTML) checksums.json
+.PHONY: all checksums docs rsc clean
 
-%.html: %.md contrib/html.sh contrib/html.sh.d/head.html
+all: checksums docs rsc
+
+checksums: checksums.json
+
+checksums.json: contrib/checksums.sh $(ALL_RSC)
+	contrib/checksums.sh > $@
+
+docs: $(HTML)
+
+style.css: contrib/general/style.css
+	cp $< $@
+
+%.html: %.md style.css contrib/html.sh contrib/html.sh.d/head.html
 	contrib/html.sh $< > $@
 
+rsc: $(GEN_RSC)
+
 %.capsman.rsc: %.template.rsc Makefile
 	sed -e '/\/interface\/wifi\//d' -e '/\/interface\/wireless\//d' -e 's|%TEMPL%|.capsman|' \
 		-e '/^# NOT \/caps-man\/ #$$/,/^# NOT \/caps-man\/ #$$/d' \
@@ -32,8 +45,5 @@ all: $(CAPSMAN) $(LOCAL) $(WIFI) $(HTML) checksums.json
 		-e '/^# !!/,/^# !!/c # !! Do not edit this file, it is generated from template!' \
 		< $< > $@
 
-checksums.json: contrib/checksums.sh *.rsc */*.rsc
-	contrib/checksums.sh
-
 clean:
 	rm -f $(HTML) checksums.json

README.md

@@ -63,7 +63,7 @@ First time users should take the long way below.
 
 Want to see it in action? I've had a presentation [Repository based
 RouterOS script distribution ↗️](https://www.youtube.com/watch?v=B9neG3oAhcY)
-including demonstation recorded live at [MUM Europe
+including demonstration recorded live at [MUM Europe
 2019 ↗️](https://mum.mikrotik.com/2019/EU/) in Vienna.
 
 > ⚠️ **Warning**: Some details changed. So see the presentation, then follow

contrib/checksums.sh

@@ -6,4 +6,4 @@ set -e
 
 md5sum $(find -name '*.rsc' | sort) | \
 	sed -e "s| \./||" -e 's|.rsc$||' | \
-	jq --raw-input --null-input '[ inputs | split (" ") | { (.[1]): (.[0]) }] | add' > 'checksums.json'
+	jq --raw-input --null-input '[ inputs | split (" ") | { (.[1]): (.[0]) }] | add'

contrib/general/style.css

@@ -0,0 +1,75 @@
+/* stylesheet for RouterOS Scripts */
+body {
+  font-family: fira-sans, sans-serif;
+  font-size: 10pt;
+  background-color: transparent;
+}
+@media only screen and (orientation: landscape) {
+  body {
+    margin-left: 10vw;
+    margin-right: 10vw;
+  }
+}
+h2 {
+  border-bottom: 1px solid #ccc;
+  color: #000;
+}
+a {
+  text-decoration: none;
+}
+a:hover {
+  text-decoration: underline;
+}
+blockquote {
+  border-left: 4px solid #ccc;
+  padding: 0 10px;
+  color: #777;
+}
+code {
+  margin: 0 2px;
+  padding: 2px 5px;
+  border: 1px solid #ccc;
+  background-color: #f8f8f8;
+  border-radius: 3px;
+}
+div.notification {
+  position: relative;
+  float: right;
+  width: 600px;
+  border: 3px outset #6c5d53;
+  /* border-radius: 5px; */
+  padding: 10px;
+  background-color: #e6e6e6;
+}
+div.content {
+  padding-left: 60px;
+}
+img.logo {
+  float: left;
+  border-radius: 50%;
+}
+p.heading {
+  margin: 0px;
+  font-weight: bold;
+  text-decoration: underline;
+}
+p.hint {
+  display: none;
+}
+pre {
+  font-family: fira-mono, monospace;
+  white-space: pre-wrap;
+  background-color: #f8f8f8;
+  border: 1px solid #ccc;
+  overflow: auto;
+  padding: 6px 10px;
+  border-radius: 3px;
+}
+pre code {
+  margin: 0;
+  padding: 0;
+  border: 0;
+}
+span.link {
+  color: #863600;
+}

contrib/html.sh

@@ -2,8 +2,14 @@
 
 set -e
 
-sed "s|__TITLE__|$(head -n1 "${1}")|" < "${0}.d/head.html"
+RELTO="$(dirname "${1}")"
+sed \
+	-e "s|__TITLE__|$(head -n1 "${1}")|" \
+	-e "s|__STYLE__|$(realpath --relative-to="${RELTO}" style.css)|" \
+	-e "s|__LOGO__|$(realpath --relative-to="${RELTO}" logo.png)|" \
+	< "${0}.d/head.html"
 markdown -f toc,idanchor "${1}" | sed \
-	-e 's/href="\([-_\./[:alnum:]]*\)\.md"/href="\1.html"/g' \
-	-e '/<h[1234] /s| id="\(.*\)">| id="\L\1">|'
+	-e 's/href="\([-_\./[:alnum:]]*\)\.md\(#[-[:alnum:]]*\)\?"/href="\1.html\2"/g' \
+	-e '/<h[1234] /s| id="\(.*\)">| id="\L\1">|' \
+	-e '/<h[1234] /s|-2c-||'
 printf '</body></html>'

contrib/html.sh.d/head.html

@@ -1,15 +1,6 @@
 <!DOCTYPE html><html lang="en">
-<head><title>RouterOS Scripts :: __TITLE__</title>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<style>
-  body { font-family: sans-serif; }
-  h2 { border-bottom: 1px solid #ccc; color: #000; }
-  a { text-decoration: none; }
-  a:hover { text-decoration: underline; }
-  blockquote { border-left: 4px solid #ccc; padding: 0 10px; color: #777; }
-  code { margin: 0 2px; padding: 2px 5px; border: 1px solid #ccc; background-color: #f8f8f8; border-radius: 3px; }
-  pre { background-color: #f8f8f8; border: 1px solid #ccc; overflow: auto; padding: 6px 10px; border-radius: 3px; }
-  pre code { margin: 0; padding: 0; border: 0; }
-</style>
-<link rel="icon" href="/logo.png" type="image/png">
+<head><meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>RouterOS Scripts :: __TITLE__</title>
+<link rel="stylesheet" type="text/css" href="__STYLE__">
+<link rel="icon" type="image/png" href="__LOGO__">
 </head><body>

contrib/logo-color.d/style.css

@@ -1,5 +0,0 @@
-body {
-  font-family: fira-sans, sans-serif;
-  font-size: 10pt;
-  background-color: transparent;
-}

contrib/logo-color.html

@@ -1,14 +1,14 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="UTF-8">
-<title>RouterOS-Scripts Logo Color Changer</title>
-<link rel="stylesheet" type="text/css" href="logo-color.d/style.css">
+<!DOCTYPE html><html lang="en">
+<head><meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>RouterOS Scripts :: Logo Color Changer</title>
+<link rel="stylesheet" type="text/css" href="general/style.css">
+<link rel="icon" type="image/png" href="../logo.png">
 <script src="logo-color.d/script.js"></script>
-</head>
-<body>
+</head><body>
 
-<h1>RouterOS-Scripts Logo Color Changer</h1>
+<h1>Logo Color Changer</h1>
+
+<p><a href="../README.html">⬅️ Go back to main README</a></p>
 
 <p>You want the logo for your own notifications? But you joined the
 <a href="https://t.me/routeros_scripts">Telegram Group</a> and want
@@ -36,5 +36,8 @@ for other browsers may differ.)</p>
 <a href="../../about/doc/mod/notification-telegram.md#set-a-profile-photo">Set
 a profile photo</a> for your Telegram bot.</p>
 
-</body>
-</html>
+<hr />
+
+<p><a href="../README.html">⬅️ Go back to main README</a><br/>
+<a href="#top">⬆️ Go back to top</a></p>
+</body></html>

contrib/notification.d/style.css

@@ -1,36 +0,0 @@
-body {
-  font-family: fira-sans, sans-serif;
-  font-size: 10pt;
-  background-color: transparent;
-}
-div.notification {
-  position: relative;
-  float: right;
-  width: 600px;
-  border: 3px outset #6c5d53;
-  /* border-radius: 5px; */
-  padding: 10px;
-  background-color: #e6e6e6;
-}
-div.content {
-  padding-left: 60px;
-}
-img.logo {
-  float: left;
-  border-radius: 50%;
-}
-p.heading {
-  margin: 0px;
-  font-weight: bold;
-  text-decoration: underline;
-}
-p.hint {
-  display: none;
-}
-pre {
-  font-family: fira-mono, monospace;
-  white-space: pre-wrap;
-}
-span.link {
-  color: #863600;
-}

contrib/notification.html

@@ -1,14 +1,14 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="UTF-8">
-<title>RouterOS-Scripts Notification Generator</title>
-<link rel="stylesheet" type="text/css" href="notification.d/style.css">
-<script src="notification.d/script.js"></script> 
-</head>
-<body>
+<!DOCTYPE html><html lang="en">
+<head><meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>RouterOS Scripts :: Notification Generator</title>
+<link rel="stylesheet" type="text/css" href="general/style.css">
+<link rel="icon" type="image/png" href="../logo.png">
+<script src="notification.d/script.js"></script>
+</head><body>
 
-<h1>RouterOS-Scripts Notification Generator</h1>
+<h1>Notification Generator</h1>
+
+<p><a href="../README.html">⬅️ Go back to main README</a></p>
 
 <div class="notification">
   <img src="../logo.svg" alt="logo" class="logo" width=48 height=48>
@@ -16,8 +16,8 @@
   <p id="heading" class="heading">[<span id="hostname">MikroTik</span>] <span id="subject">ℹ️  Subject</span></p>
   <pre id="message">Message</pre>
   <p id="link" class="hint">🔗 <span id="link-text" class="link">https://eworm.de/</span></p>
-  <p id="queued" class="hint">⏰ This message was queued since <span id="queued-since">oct/18/2022 18:30:48</span> and may be obsolete.</p>
-  <p id="cut" class="hint">✂️ The message was too long and has been truncated, cut off <span id="cut-percent">13</span>%!</p>
+  <p id="queued" class="hint">⏰ This message was queued since <i><span id="queued-since">2025-10-29 16:06:18</span></i> and may be obsolete.</p>
+  <p id="cut" class="hint">✂️ The message was too long and has been truncated, cut off <i><span id="cut-percent">13</span>%</i>!</p>
   </div>
 </div>
 
@@ -25,11 +25,14 @@
 <p>Subject: <input type="text" size=50 value="ℹ️  Subject" onchange="update(this, 'subject')"></p>
 <p>Message: <textarea id="w3review" name="w3review" rows="4" cols="50" onchange="update(this, 'message')">Message</textarea></p>
 <p><input type="checkbox" onclick="visible(this, 'link')"> Show link: <input type="text" value="https://eworm.de/" onchange="update(this, 'link-text')"></p>
-<p><input type="checkbox" onclick="visible(this, 'queued')"> Queued since <input type="text" value="oct/18/2022 18:30:48" onchange="update(this, 'queued-since')"></p>
+<p><input type="checkbox" onclick="visible(this, 'queued')"> Queued since <input type="text" value="2025-10-29 16:06:18" onchange="update(this, 'queued-since')"></p>
 <p><input type="checkbox" onclick="visible(this, 'cut')"> Cut-off with <input type="number" min=1 max=99 value=13 onchange="update(this, 'cut-percent')"> percent</p>
 
 <p>Then right-click, click "<i>Take Screenshot</i>" and finally select the
 notification and download it.</p>
 
-</body>
-</html>
+<hr />
+
+<p><a href="../README.html">⬅️ Go back to main README</a><br/>
+<a href="#top">⬆️ Go back to top</a></p>
+</body></html>

fw-addr-lists.d/allow

@@ -1,3 +1,3 @@
 # an ip address list for use with fw-addr-lists script
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/fw-addr-lists.md
-git.eworm.de
+# https://rsc.eworm.de/doc/fw-addr-lists.md
+rsc.eworm.de

fw-addr-lists.d/block

@@ -1,5 +1,5 @@
 # an ip address list for use with fw-addr-lists script
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/fw-addr-lists.md
+# https://rsc.eworm.de/doc/fw-addr-lists.md
 
 # example.net
 93.184.216.34

global-functions.rsc

@@ -1310,9 +1310,19 @@
         }
       } do={
         $LogPrint warning $0 ("Failed fetching script '" . $ScriptVal->"name" . "': " . $Err);
+        :if ($Err != "Fetch failed with status 404") do={
+          :error false;
+        }
+
         :if ($ScriptVal->"source" = "#!rsc by RouterOS\n") do={
           $LogPrint warning $0 ("Removing dummy. Typo on installation?");
           /system/script/remove $Script;
+          :error false;
+        }
+        :if ([ :len ($ScriptInfo->"base-url") ] = 0 && [ :len ($ScriptInfo->"url-suffix") ] = 0 && \
+             [ :len $CheckSum ] = 0) do={
+          $LogPrintOnce warning $0 \
+              ("Added the script manually? Skip updates with 'ignore=true' in comment.");
         }
         :error false;
       }