From cd7ec87178f0f6a3d790c3202595bd501e5b9d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Mon, 27 Feb 2023 02:20:54 +0100 Subject: [PATCH] Add check to Makefile for scripts version mismatch --- Makefile | 21 +++++++++++++-------- msman-hepler.tar.gz | Bin 2971 -> 0 bytes 2 files changed, 13 insertions(+), 8 deletions(-) delete mode 100644 msman-hepler.tar.gz diff --git a/Makefile b/Makefile index d352360..56621a4 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,20 @@ # Simple makefile to create a tarball of the msman helper scripts +# Turn off verbose mode +MAKEFLAGS += -s all: - source msman.sh - source .msman/version.sh - if [[ $CURRENT_SCRIPT_VERSION == $EXTRA_SCRIPTS_VERSION]]; then - cp -r .msman msman - tar -czf msman-hepler.tar.gz msman - rm -rf msman - else - echo "msman.sh and .msman/version.sh are not in sync" + CURRENT_SCRIPT_VERSION=`grep "CURRENT_SCRIPT_VERSION=" msman.sh | sed -e "s/CURRENT_SCRIPT_VERSION=//g"`; \ + EXTRA_VERSION=`grep "EXTRA_SCRIPTS_VERSION=" .msman/version.sh | sed -e "s/EXTRA_SCRIPTS_VERSION=//g"`; \ + if [ "$$CURRENT_SCRIPT_VERSION" != "$$EXTRA_VERSION" ]; then \ + echo "ERROR: The version in msman.sh and .msman/version.sh are not the same!"; \ + echo "ERROR: Please make sure they are the same."; \ + exit 1; \ fi + rm -rf msman + mkdir msman + cp -r .msman msman + tar -czf msman-hepler.tar.gz msman + rm -rf msman clean: rm -rf msman diff --git a/msman-hepler.tar.gz b/msman-hepler.tar.gz deleted file mode 100644 index fbbbd80cba8cedb718d0a57de3609436718b609a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2971 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 RXvSY?`~fYU^>zSI0024U(hL9q