From 246d7b2f481eafe146b3cb7430f11c3b7868a7c6 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Mon, 13 Mar 2023 14:14:39 +0300
Subject: [PATCH] Updated/fixed the build system, not worrect versions are
 publshed.

This update also contains all the chaniges from v0.1.11.

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 Makefile      | 27 +++++++++++++++++++++------
 photobook.cls |  4 ++--
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 1248825..ddbd047 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,8 @@
 
 .EXPORT_ALL_VARIABLES:
 
+#.ONESHELL:
+
 # NOTE: this makes things run consistently on different systems including 
 # 		things like Android...
 SHELL := bash
@@ -287,8 +289,6 @@ ctan-dist: dist
 	cp -f $(DIST_DIR)/$(DIST_NAME).zip $(DIST_DIR)/$(MODULE).zip
 
 
-
-# XXX add checks for commit and push...
 .PHONY: tag
 tag:
 	@echo "Will create and publish git tag:"
@@ -298,10 +298,25 @@ tag:
 		| tail -n 5 \
 		| sed 's/^/    /' \
 		| tac
-	@[ $$(git status --porcelain=v1 2> /dev/null | grep -v '??' | wc -l) = 0 ] \
-		|| echo -e "\nWARNING: There are uncommited changes!\n"
-	@echo "Note that this must be done after a commit and a push."
-	@read -p "(press any key to continue or ctrl-c to cancel)"
+#	# check if we need to bug the user about committing and/or pushing stuff...
+	@\
+		UNCOMITTED=$$(git status --porcelain=v1 2> /dev/null | grep -v '??' | wc -l) ;\
+		UNPUSHED=$$(git log origin..HEAD | wc -l) ;\
+		if ! [ $$UNCOMITTED = 0 ] ; then \
+			echo ;\
+			echo "WARNING: Uncommited changes found!" ;\
+		fi ;\
+		if ! [ $$UNPUSHED = 0 ] ; then \
+			[ $$UNCOMITTED = 0 ] \
+				&& echo ;\
+			echo "WARNING: Unpushed commits found!" ;\
+		fi ;\
+		if ! [ $$UNCOMITTED = 0 ] || ! [ $$UNPUSHED = 0 ] ; then \
+			echo ;\
+			echo "Note that this must be done after a commit and a push." ;\
+			echo "(press any key to continue or ctrl-c to cancel)" ;\
+			read ;\
+		fi ;\
 	git tag "v$(VERSION)"
 	git push origin "v$(VERSION)"
 
diff --git a/photobook.cls b/photobook.cls
index 14c8879..f9bc4d2 100644
--- a/photobook.cls
+++ b/photobook.cls
@@ -76,8 +76,8 @@
 
 %%% NOTE: \def\<module-name>@[A-Z]+ macros will be visible to both the 
 %%%		code and the generated docs...
-\edef\photobook@FILEVERSION{v0.1.11}
-\edef\photobook@FILEDATE{2023-03-11}
+\edef\photobook@FILEVERSION{v0.1.12}
+\edef\photobook@FILEDATE{2023-03-13}
 
 
 %% \documentclass{ltxdoc}