From: vados-dev Date: Fri, 6 Mar 2026 16:07:31 +0000 (+0300) Subject: Auto-commit: Makefile updated on 3/6/2026 X-Git-Tag: v0.0.1^0 X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=1ea062465c65c23f9ca2b654bb580c9de9d88818;p=Mikrotiks%2Fros.vados.ru.git Auto-commit: Makefile updated on 3/6/2026 --- diff --git a/Makefile b/Makefile index 4c3bec0e..fec07c6b 100644 --- a/Makefile +++ b/Makefile @@ -40,10 +40,7 @@ COMM_INFO := $(shell echo -e "Autocommit in repo: $(COMM_REPO), generated export BUILD_DIR BIN_DIR HTML_DIR DATE DTSTAMP VERSION COMMIT_ID COMM_TAG COMM_HASH COMM_INFO - -.PHONY: all checksums commit diff commitinfo clean -#$(COMMITINFO) gitcheck clean -# docs rsc clean +.PHONY: all checksums commit check-uncommitted commitinfo clean all: checksums commit commitinfo @@ -52,30 +49,19 @@ checksums: checksums.json checksums.json: bin/checksums.sh $(ALL_RSC) bin/checksums.sh > html/tmp/$@ -commitinfo: $(commitinfo.sh) - -.PHONY: $(commitinfo.sh) -$(commitinfo.sh): $(GLOB_RSC) - $(commitinfo.sh) $< > $<~ - mv $<~ $< - -#$(GLOB_FUNC): -# $(runsed) $@< > $@<~ -# mv $@<~ $@< - - - -gitcheck: check-uncommitted +commit: check-uncommitted #@if [ -n "$$(git diff --quiet)" ] && [ -n "$$(git diff --cached --quiet)" ] && [ -n "$$(git ls-files --others --exclude-standard)" ]; then \ +#[ -n "$$(git status --porcelain)" ] check-uncommitted: - @if [ -n "$$(git diff --quiet)" ] && [ -n "$$(git diff --cached --quiet)" ] && [ -n "$$(git status --porcelain)" ]; then \ - echo "Warning: Uncommitted changes detected! Go to autocmmit..."; \ + @if [ -n "$$(git diff --quiet)" ] && [ -n "$$(git diff --cached --quiet)" ] && [ -n "$$(git ls-files --others --exclude-standard)" ]; then \ + echo "Warning: Uncommitted changes detected! Go to autocommit steps..."; \ else \ - echo "Repository is clean (no uncommitted or untracked changes). Exit."; \ - exit 0; \ + echo "Repository is clean (no uncommitted or untracked changes). Go to additional checks..."; \ + cd $(BUILD_DIR) && \ + git fi @@ -109,6 +95,14 @@ fake_target: # git push origin $(BRANCH) # git commit -m "$(@:git-%=%)" +commitinfo: $(commitinfo.sh) + +.PHONY: $(commitinfo.sh) +$(commitinfo.sh): $(GLOB_RSC) + $(commitinfo.sh) $< > $<~ + mv $<~ $< + + clean: git checkout HEAD -- .