From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Thu, 12 Mar 2026 01:06:28 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 04:06:26 12.03.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=5553d96bfca5823e636c016e302c850a6b326273;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 04:06:26 12.03.2026. --- diff --git a/Makefile b/Makefile index 417b9cf19..964f324bf 100644 --- a/Makefile +++ b/Makefile @@ -43,19 +43,21 @@ run: @$(MAKE) check; rc=$$?; \ if [ $$rc -eq 0 ]; then \ echo "[run] check $$rc, go to commitinfo.sh..."; \ - @$(MAKE) $(commitinfo.sh); ci=$$?; \ + $(MAKE) $(commitinfo.sh); ci=$$?; \ if [ $$ci -eq 0 ]; then \ echo "[run] commitinfo.sh exit $$ci. Go to checksums.sh..."; \ - @$(MAKE) checksums; cs=$$?; \ + $(MAKE) checksums; cs=$$?; \ if [ $$cs -eq 0 ]; then \ - echo "[run] checksums.sh exit $$rc. Do git add commit and push..."; \ + echo "[run] checksums.sh exit $$cs. Do git add commit and push..."; \ git add .; \ git commit -m '$(COMM_INFO)'; \ git push; \ else \ $(MAKE) notify "[run] checksums.sh exit $$cs, check it!"; \ - else \ + fi \ + else \ $(MAKE) notify "[run] commitinfo.sh exit $$ci, check it!"; \ + fi \ else \ echo "[run] check exit $$rc, repo is clean exit Ok."; \ fi diff --git a/bin/check_repo.sh b/bin/check_repo.sh index 03e2e2abc..1ecb927dc 100755 --- a/bin/check_repo.sh +++ b/bin/check_repo.sh @@ -12,13 +12,13 @@ if [[ -n "$dirty" ]]; then printf "%s\n" "$dirty" echo "[check_repo] resolve conflicts and run: git add && git commit" bash bin/notify_telegram.sh "STOP: repo conflicts in $(pwd)" - exit 2 + exit 1 fi # Exit 0 only when repo is NOT clean to allow autocommit flow. if git diff --quiet && git diff --cached --quiet && [[ -z "$lsfiles" ]]; then echo "[check_repo] repo clean. Exit 1 from check_repo.sh." - exit 2 + exit 1 else echo "[check_repo] repo not clean. Exit 0 from check_repo.sh." exit 0 diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 5e3d48615..6c9100d27 100644 --- a/html/AM-GlobalFunc.rsc +++ b/html/AM-GlobalFunc.rsc @@ -16,9 +16,9 @@ :global GlobalFuncReady false; # Git commit id & info, expected configuration version -:global CommitId "main/158/3c1bc494"; +:global CommitId "main/161/17d2d788"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:34:24 12.03.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 04:06:27 12.03.2026."; # The variables are received right here. :global GlobalConfVersion 138;