diff --git a/Makefile b/Makefile index 83c38cc..bd6d302 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,9 @@ checksums: checksums.json checksums.json: contrib/checksums.sh $(ALL_RSC) contrib/checksums.sh > $@ -commitinfo: - contrib/commitinfo.sh +commitinfo: global-functions.rsc + contrib/commitinfo.sh $< > $<~ + mv $<~ $< docs: $(HTML) diff --git a/contrib/commitinfo.sh b/contrib/commitinfo.sh index 6c82465..21faf9f 100755 --- a/contrib/commitinfo.sh +++ b/contrib/commitinfo.sh @@ -1,6 +1,6 @@ #!/bin/sh -sed -i \ +sed \ -e "/^:global CommitId/c :global CommitId \"${COMMITID:-unknown}\";" \ -e "/^:global CommitInfo/c :global CommitInfo \"${COMMITINFO:-unknown}\";" \ - global-functions.rsc + < "${1}" diff --git a/global-functions.rsc b/global-functions.rsc index 91e8d62..db9eac6 100644 --- a/global-functions.rsc +++ b/global-functions.rsc @@ -1900,10 +1900,11 @@ } } +# add (and fix) global scripts scheduler +:local OnEvent "/system/script { run global-config; run global-functions; }"; :if ([ :len [ /system/scheduler/find where name="global-scripts" ] ] = 0) do={ /system/scheduler/add name="global-scripts" start-time=startup; } -:local OnEvent "/system/script { run global-config; run global-functions; }"; :if ([ /system/scheduler/get "global-scripts" on-event ] != $OnEvent) do={ /system/scheduler/set "global-scripts" on-event=$OnEvent; }