]> Git [git.vados.ru] :: Repos - Mikrotiks/ros.vados.ru.git/commitdiff
Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:34:24 12.03.2026.
authorvados-dev <192440777+vados-dev@users.noreply.github.com>
Thu, 12 Mar 2026 00:34:25 +0000 (03:34 +0300)
committervados-dev <192440777+vados-dev@users.noreply.github.com>
Thu, 12 Mar 2026 00:34:25 +0000 (03:34 +0300)
Makefile
html/AM-GlobalFunc.rsc

index 829912705001be508879d0aab521847a5ff435af..c6ed6f802b387dd11e822229ec14421e6d2d1767 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,16 +39,20 @@ export BUILD_DIR REPO_DIR ALL_RSC GLOB_RSC
 
 .PHONY: run check notify checksums $(commitinfo.sh) test
 
-run: check
-       @echo "[run] exit 0, go to commitinfo.sh..."
-       @$(MAKE) $(commitinfo.sh)
-       @echo "[run] commitinfo.sh exit 0. Go to checksums.sh..."
-       @$(MAKE) checksums
-       @echo "[run] checksums.sh exit 0.  Go to repo add, commit and push..."
-       cd $(BUILD_DIR)
-       git add .
-       git commit -m '$(COMM_INFO)'
-       git push
+run: 
+       @$(MAKE) check; rc=$$?; \
+    if [ $$rc -eq 0 ]; then \
+            echo "[run] check rc=0, go to commitinfo.sh..."; \
+            $(MAKE) $(commitinfo.sh); \
+                       echo "[run] commitinfo.sh exit 0. Go to checksums.sh..."; \
+            $(MAKE) checksums; \
+            echo "[run] checksums.sh exit 0. Do git add commit and push..."; \
+            git add .; \
+            git commit -m '$(COMM_INFO)'; \
+            git push; \
+    else \
+            echo "[run] check rc=$$rc, stop"; \
+    fi
        @echo "[run] done"
 
 check:
index 01d3cf81298396bba8a7e9084628af6653bdfb1f..5e3d48615c0dfe0a7963c8aa5f0cb6fdf8f22105 100644 (file)
@@ -16,9 +16,9 @@
 :global GlobalFuncReady false;
 
 # Git commit id & info, expected configuration version
-:global CommitId "main/157/1cc15929";
+:global CommitId "main/158/3c1bc494";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:26:05 12.03.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:34:24 12.03.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 138;