]> Git [git.vados.ru] :: Repos - Mikrotiks/ros.vados.ru.git/commitdiff
Autocommit in repo: ros.vados.ru, generated by owner: root, in 04:06:26 12.03.2026.
authorvados-dev <192440777+vados-dev@users.noreply.github.com>
Thu, 12 Mar 2026 01:06:28 +0000 (04:06 +0300)
committervados-dev <192440777+vados-dev@users.noreply.github.com>
Thu, 12 Mar 2026 01:06:28 +0000 (04:06 +0300)
Makefile
bin/check_repo.sh
html/AM-GlobalFunc.rsc

index 417b9cf191648c5fc08e25b100ed7a2cebd4e63a..964f324bf7be3f9347da7a4a9b5b86cde01291a9 100644 (file)
--- 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
index 03e2e2abcca51c21c98b533f76cb8881caa45a15..1ecb927dc709d3cad0ee712618e8f446c7f73734 100755 (executable)
@@ -12,13 +12,13 @@ if [[ -n "$dirty" ]]; then
     printf "%s\n" "$dirty"
     echo "[check_repo] resolve conflicts and run: git add <files> && 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
index 5e3d48615c0dfe0a7963c8aa5f0cb6fdf8f22105..6c9100d27c5707e05cdb4098a815b5a335d9add3 100644 (file)
@@ -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;