From d8a239237c74ac2b6a5dd9cbc6029fd2681f3435 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Thu, 8 Aug 2024 18:38:12 -0400 Subject: [PATCH] Decouple MUTN and libmutton versions --- packaging/main.sh | 8 ++++---- packaging/pkgbuild-git-stable.sh | 2 +- src/cli/1globals.go | 1 + src/cli/printInfo.go | 4 +++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packaging/main.sh b/packaging/main.sh index 6cdb401..7358485 100755 --- a/packaging/main.sh +++ b/packaging/main.sh @@ -1,9 +1,9 @@ #!/bin/sh -# get version number from LibmuttonVersion +# get version number from cli package cd .. -printf 'package main\nimport (\n"fmt"\n"github.com/rwinkhart/MUTN/src/backend"\n)\nfunc main() {\nfmt.Println(backend.LibmuttonVersion)\n}' > ./version.go -version=$(go run ./version.go) +printf 'package main\nimport (\n"fmt"\n"github.com/rwinkhart/MUTN/src/cli"\n)\nfunc main() {\nfmt.Println(cli.MUTNVersion)\n}' > ./version.go +version=$(go run -ldflags="-s -w" -tags noMarkdown ./version.go) rm ./version.go cd ./packaging @@ -15,7 +15,7 @@ else fi # ensure output directory exists -mkdir -p ./output +mkdir -p ./1output case "$1" in pkgbuild-git-stable) diff --git a/packaging/pkgbuild-git-stable.sh b/packaging/pkgbuild-git-stable.sh index 0a3ee1a..619f884 100644 --- a/packaging/pkgbuild-git-stable.sh +++ b/packaging/pkgbuild-git-stable.sh @@ -55,6 +55,6 @@ package() { install -Dm644 ./completions/bash/mutn \${pkgdir}/usr/share/bash-completion/completions/mutn install -Dm644 ./docs/man.gz \${pkgdir}/usr/share/man/man1/mutn.1.gz } -" > output/PKGBUILD +" > 1output/PKGBUILD printf '\nPKGBUILD generated\n\n' } diff --git a/src/cli/1globals.go b/src/cli/1globals.go index beed957..394ccda 100644 --- a/src/cli/1globals.go +++ b/src/cli/1globals.go @@ -15,4 +15,5 @@ var ( const ( AnsiBold = "\033[1m" ansiBlackOnWhite = "\033[38;5;0;48;5;15m" + MUTNVersion = "0.2.B" // untagged releases feature a letter suffix corresponding to the eventual release version, e.g "0.2.A" -> "0.2.0", "0.2.B" -> "0.2.1" ) diff --git a/src/cli/printInfo.go b/src/cli/printInfo.go index ef1f1d2..b36e2b4 100644 --- a/src/cli/printInfo.go +++ b/src/cli/printInfo.go @@ -147,9 +147,11 @@ func Version() { " ◎-◎ // \\\\ " + ansiVersionMeat + "♥♥♥♥♥♥♥♥♥" + core.AnsiReset + " // \\\\ /|\\\n" + ansiVersionOutline + "<><><><><><><><><><><><><><>-<><><><><><><><><><><><><><>\n" + "\\" + ansiBlackOnWhite + " " + core.AnsiReset + ansiVersionOutline + "/\n" + - "\\" + ansiBlackOnWhite + " MUTN Version " + core.LibmuttonVersion + " " + core.AnsiReset + ansiVersionOutline + "/\n" + + "\\" + ansiBlackOnWhite + " MUTN v" + MUTNVersion + " " + core.AnsiReset + ansiVersionOutline + "/\n" + "\\" + ansiBlackOnWhite + " The Tripe Transmission Update " + core.AnsiReset + ansiVersionOutline + "/\n" + "\\" + ansiBlackOnWhite + " " + core.AnsiReset + ansiVersionOutline + "/\n" + + "\\" + ansiBlackOnWhite + " Built with libmutton v" + core.LibmuttonVersion + " " + core.AnsiReset + ansiVersionOutline + "/\n" + + "\\" + ansiBlackOnWhite + " " + core.AnsiReset + ansiVersionOutline + "/\n" + "\\" + ansiBlackOnWhite + " Copyright (c) 2024 Randall Winkhart " + core.AnsiReset + ansiVersionOutline + "/\n" + "\\" + ansiBlackOnWhite + " " + core.AnsiReset + ansiVersionOutline + "/\n" + "<><><><><><><><><><><><><><>-<><><><><><><><><><><><><><>\n" + core.AnsiReset +