diff --git a/Makefile b/Makefile index 809ca10..77560a7 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ ROOT_COMPILATION_GID ?= 65534 build: mkdir -p build - cd src/bpm; $(GO) build $(GOFLAGS) -ldflags "-w -X 'git.enumerated.dev/bubble-package-manager/bpm/src/bpm/config.BpmVersion=$(VERSION)' -X 'git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib.rootCompilationUID=$(ROOT_COMPILATION_UID)' -X 'git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib.rootCompilationGID=$(ROOT_COMPILATION_GID)'" -o ../../build/bpm git.enumerated.dev/bubble-package-manager/bpm/src/bpm + cd src/bpm; $(GO) build $(GOFLAGS) -ldflags "-w -X 'main.BpmVersion=$(VERSION)' -X 'git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib.rootCompilationUID=$(ROOT_COMPILATION_UID)' -X 'git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib.rootCompilationGID=$(ROOT_COMPILATION_GID)'" -o ../../build/bpm git.enumerated.dev/bubble-package-manager/bpm/src/bpm install: build/bpm config/ # Create directory diff --git a/src/bpm/config/config.go b/src/bpm/config/config.go deleted file mode 100644 index 790f517..0000000 --- a/src/bpm/config/config.go +++ /dev/null @@ -1,3 +0,0 @@ -package config - -var BpmVersion = "dev" diff --git a/src/bpm/main.go b/src/bpm/main.go index ade1e0e..2a4cc52 100644 --- a/src/bpm/main.go +++ b/src/bpm/main.go @@ -14,7 +14,6 @@ import ( "sort" "strings" - "git.enumerated.dev/bubble-package-manager/bpm/src/bpm/config" "git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib" "github.com/lithammer/fuzzysearch/fuzzy" @@ -26,6 +25,8 @@ import ( /* A simple-to-use package manager */ /* ------------------------------------------------------- */ +var BpmVersion = "dev" + var currentFlagSet *flag.FlagSet var exitCode = 0 @@ -47,7 +48,7 @@ func main() { switch subcommand { case "v", "version": fmt.Println("Bubble Package Manager (BPM)") - fmt.Println("Version: " + config.BpmVersion) + fmt.Println("Version: " + BpmVersion) case "q", "query": // Setup flags and help currentFlagSet = flag.NewFlagSet("query", flag.ExitOnError)