From e82f36717bdacc91fcc43b71f1d4e77c67ba0694 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Mon, 13 Mar 2023 16:35:18 +0300
Subject: [PATCH] cleanup and minor tweaks...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 .github/workflows/make-dist.yml | 24 ++++++++++--------------
 Makefile                        |  6 +++---
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/make-dist.yml b/.github/workflows/make-dist.yml
index f88b531..87c991f 100644
--- a/.github/workflows/make-dist.yml
+++ b/.github/workflows/make-dist.yml
@@ -21,24 +21,20 @@ jobs:
           apk add make git zip
           git config --global --add safe.directory '*'
           echo "VERSION=$(make version)" >> $GITHUB_ENV
-          COMMENT="$(git log -1 --pretty=%B | grep -v "Signed-off-by:")"
-          COMMENT="${COMMENT//'%'/'%25'}"
-          COMMENT="${COMMENT//$'\n'/'%0A'}"
-          COMMENT="${COMMENT//$'\n'/'%0D'}"
-          echo 'COMMENT<<EOF' >> $GITHUB_ENV
-          echo "${COMMENT}" >> $GITHUB_ENV
-          echo 'EOF' >> $GITHUB_ENV
-          # XXX if comment is multi-line it breaks the CTAN announcement...
+          # XXX not sure about this...
+          #COMMENT="$(git log -1 --pretty=%B | grep -v "Signed-off-by:")"
+          #COMMENT="${COMMENT//'%'/'%25'}"
+          #COMMENT="${COMMENT//$'\n'/'%0A'}"
+          #COMMENT="${COMMENT//$'\n'/'%0D'}"
           #echo 'COMMENT<<EOF' >> $GITHUB_ENV
-          #git log -1 --pretty=%B | grep -v "Signed-off-by:" >> $GITHUB_ENV
+          #echo "${COMMENT}" >> $GITHUB_ENV
           #echo 'EOF' >> $GITHUB_ENV
+          # XXX if comment is multi-line it breaks the CTAN announcement...
+          echo 'COMMENT<<EOF' >> $GITHUB_ENV
+          git log -1 --pretty=%B | grep -v "Signed-off-by:" >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
           make dist ctan-dist
 
-    - name: TEST
-      run: |
-        echo ${{ env.VERSION }}
-        echo ${{ env.COMMENT }}
-
     - name: Release
       uses: softprops/action-gh-release@v1
       if: startsWith(github.ref, 'refs/tags/')
diff --git a/Makefile b/Makefile
index 7130fc9..088005d 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,6 @@
 
 .EXPORT_ALL_VARIABLES:
 
-#.ONESHELL:
 
 # NOTE: this makes things run consistently on different systems including 
 # 		things like Android...
@@ -60,8 +59,9 @@ MODULE := photobook
 VERSION = $(strip $(shell \
 	cat $(MODULE).cls \
 		| grep 'VERSION{' \
-	 	| sed 's/.*{\(.*\)}.*/\1/' \
-		| sed 's/v//'))
+	 	| sed \
+			-e 's/.*{\(.*\)}.*/\1/' \
+			-e 's/v//'))
 DATE = $(strip $(shell date "+%Y%m%d%H%M"))
 COMMIT = $(strip $(shell git rev-parse HEAD))