diff --git a/Makefile b/Makefile index 50ab9edc..f841ca2b 100644 --- a/Makefile +++ b/Makefile @@ -8,10 +8,6 @@ GEN_RSC := $(wildcard *.capsman.rsc *.local.rsc *.wifi.rsc) 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) -export DATE VERSION - .PHONY: all checksums docs rsc clean all: checksums docs rsc @@ -28,14 +24,23 @@ docs: $(HTML) rsc: $(GEN_RSC) -%.capsman.rsc: %.template.rsc contrib/template-capsman.sh - contrib/template-capsman.sh $< > $@ +%.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' \ + -e '/^# !!/,/^# !!/c # !! Do not edit this file, it is generated from template!' \ + < $< > $@ -%.local.rsc: %.template.rsc contrib/template-local.sh - contrib/template-local.sh $< > $@ +%.local.rsc: %.template.rsc Makefile + 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!' \ + < $< > $@ -%.wifi.rsc: %.template.rsc contrib/template-wifi.sh - contrib/template-wifi.sh $< > $@ +%.wifi.rsc: %.template.rsc Makefile + 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!' \ + < $< > $@ clean: rm -f $(HTML) checksums.json diff --git a/contrib/html.sh b/contrib/html.sh index 24cc9b0d..da3873e3 100755 --- a/contrib/html.sh +++ b/contrib/html.sh @@ -15,7 +15,4 @@ markdown -f toc,idanchor "${1}" | sed \ -e '/| id="\L\1">|' \ -e '/' diff --git a/contrib/html.sh.d/foot.html b/contrib/html.sh.d/foot.html deleted file mode 100644 index 106c2bd0..00000000 --- a/contrib/html.sh.d/foot.html +++ /dev/null @@ -1,4 +0,0 @@ - -

RouterOS Scripts documentation generated on __DATE__ for __VERSION__

- - diff --git a/contrib/template-capsman.sh b/contrib/template-capsman.sh deleted file mode 100755 index 3303472e..00000000 --- a/contrib/template-capsman.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - -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}" diff --git a/contrib/template-local.sh b/contrib/template-local.sh deleted file mode 100755 index 82120280..00000000 --- a/contrib/template-local.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - -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}" diff --git a/contrib/template-wifi.sh b/contrib/template-wifi.sh deleted file mode 100755 index 8d48adaa..00000000 --- a/contrib/template-wifi.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - -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}" diff --git a/general/style.css b/general/style.css index ea9b1118..4626093a 100644 --- a/general/style.css +++ b/general/style.css @@ -43,10 +43,6 @@ img.logo { float: left; border-radius: 50%; } -p.foot { - color: #777; - text-align: center; -} p.heading { margin: 0px; font-weight: bold;