diff --git a/Makefile b/Makefile index e376e568..bff54589 100644 --- a/Makefile +++ b/Makefile @@ -2,22 +2,14 @@ # template scripts -> final scripts # markdown files -> html files -ALL_RSC := $(wildcard *.rsc */*.rsc) -GEN_RSC := $(wildcard *.capsman.rsc *.local.rsc *.wifi.rsc) +CAPSMAN = $(wildcard *.capsman.rsc) +LOCAL = $(wildcard *.local.rsc) +WIFI = $(wildcard *.wifi.rsc) -MARKDOWN := $(wildcard *.md doc/*.md doc/mod/*.md) -HTML := $(MARKDOWN:.md=.html) style.css +MARKDOWN = $(wildcard *.md doc/*.md doc/mod/*.md) +HTML = $(MARKDOWN:.md=.html) style.css -.PHONY: all checksums docs rsc clean - -all: checksums docs rsc - -checksums: checksums.json - -checksums.json: contrib/checksums.sh $(ALL_RSC) - contrib/checksums.sh > $@ - -docs: $(HTML) +all: $(CAPSMAN) $(LOCAL) $(WIFI) $(HTML) checksums.json style.css: contrib/general/style.css cp $< $@ @@ -25,8 +17,6 @@ style.css: contrib/general/style.css %.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' \ @@ -45,5 +35,8 @@ rsc: $(GEN_RSC) -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 diff --git a/global-functions.rsc b/global-functions.rsc index 28223cc1..93488e28 100644 --- a/global-functions.rsc +++ b/global-functions.rsc @@ -1310,18 +1310,13 @@ } } 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; } :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."); + $LogPrintOnce warning $0 ("Added the script manually? Skip updates with 'ignore=true' in comment."); } :error false; }