From 2f388ca642607cdf94c2869fe76d43a4a2d09d26 Mon Sep 17 00:00:00 2001 From: sewn Date: Wed, 27 Sep 2023 22:45:58 +0300 Subject: [PATCH] drop 'version' --- Makefile | 1 - cmd/vinegar/vinegar.go | 11 +++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 65d7b35d..3c1baf08 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,6 @@ APPPREFIX = $(PREFIX)/share/applications ICONPREFIX = $(PREFIX)/share/icons/hicolor FLATPAK = io.github.vinegarhq.Vinegar -VERSION = `git describe --tags --dirty` GO = go GO_LDFLAGS = -s -w diff --git a/cmd/vinegar/vinegar.go b/cmd/vinegar/vinegar.go index 178880ce..c92a1007 100644 --- a/cmd/vinegar/vinegar.go +++ b/cmd/vinegar/vinegar.go @@ -17,15 +17,12 @@ import ( "github.com/vinegarhq/vinegar/wine" ) -var ( - Version string - BinPrefix string -) +var BinPrefix string func usage() { fmt.Fprintln(os.Stderr, "usage: vinegar [-config filepath] player|studio [args...]") fmt.Fprintln(os.Stderr, "usage: vinegar [-config filepath] exec prog [args...]") - fmt.Fprintln(os.Stderr, " vinegar [-config filepath] edit|kill|uninstall|delete|version|install-webview2") + fmt.Fprintln(os.Stderr, " vinegar [-config filepath] edit|kill|uninstall|delete|install-webview2") os.Exit(1) } @@ -39,7 +36,7 @@ func main() { switch cmd { // These commands don't require a configuration - case "delete", "edit", "uninstall", "version": + case "delete", "edit", "uninstall": switch cmd { case "delete": Delete() @@ -47,8 +44,6 @@ func main() { editor.EditConfig(*configPath) case "uninstall": Uninstall() - case "version": - fmt.Println(Version) } // These commands (except player & studio) don't require a configuration, // but they require a wineprefix, hence wineroot of configuration is required.