From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Wed, 15 Apr 2026 12:25:02 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 15:25:02 15.04.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=a9b079409f81bbb99a1fdf287b36e7f6c06e82da;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 15:25:02 15.04.2026. --- diff --git a/.config/.#config.mk b/.config/.#config.mk deleted file mode 120000 index f19c3a803..000000000 --- a/.config/.#config.mk +++ /dev/null @@ -1 +0,0 @@ -root@amster.2199389 \ No newline at end of file diff --git a/.config/config.mk b/.config/config.mk index 335cc7c96..e4abc834a 100644 --- a/.config/config.mk +++ b/.config/config.mk @@ -4,12 +4,14 @@ export DRY_RUN ?= 0 export DATE ?= $(shell (date '+%T %d.%m.%Y')) export DTSTAMP_FMT ?= "+%Y%m%d%H%M" export DTSTAMP ?= $(shell (date $(DTSTAMP_FMT))) -export 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 RUN_OWNER := $(shell whoami 2>/dev/null) -export COMM_REPO := $(shell git rev-parse --show-toplevel | rev | cut -d/ -f1 | rev 2>/dev/nul) -export COMM_BRANCH := $(shell git symbolic-ref --short HEAD 2>/dev/null) +export VERSION ?= $(shell git symbolic-ref --short HEAD 2>/dev/null || true)/$(shell git rev-list --count HEAD 2>/dev/null || true)/$(shell git rev-parse --short=8 HEAD 2>/dev/null || true) +export RUN_OWNER := $(shell whoami 2>/dev/null || true) +export COMM_REPO := $(shell git rev-parse --show-toplevel 2>/dev/null | rev | cut -d/ -f1 | rev || true) +# $(shell git rev-parse --show-toplevel | rev | cut -d/ -f1 | rev 2>/dev/nul) +export COMM_BRANCH := $(shell git symbolic-ref --short HEAD 2>/dev/null || true) export COMMIT_ID := $(VERSION) -export COMM_INFO := $(shell echo -e "Autocommit in repo: $(COMM_REPO), generated by owner: $(RUN_OWNER), in $(DATE)." 2>/dev/null) +export COMM_INFO := Autocommit in repo: $(COMM_REPO), generated by owner: $(RUN_OWNER), in $(DATE). +#$(shell echo -e "Autocommit in repo: $(COMM_REPO), generated by owner: $(RUN_OWNER), in $(DATE)." 2>/dev/null) export BOT_TOKEN ?= "8390868324:AAG3_d1hfVR2M6pGAgDK6ZvhOe4J97nyopw" export CHAT_ID ?= "454403445" diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 8fa36f70d..88096e8b1 100644 --- a/html/AM-GlobalFunc.rsc +++ b/html/AM-GlobalFunc.rsc @@ -17,9 +17,9 @@ :global GlobalFuncReady false; # Git commit id & info, expected configuration version -:global CommitId "main/227/c2cad7ec"; +:global CommitId "main/228/fee05e26"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 15:15:02 15.04.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 15:25:02 15.04.2026."; # The variables are received right here. :global GlobalConfVersion 138;