From a514209e434e9fff5270f61dc5a9845f3814bcc1 Mon Sep 17 00:00:00 2001 From: pygrum Date: Thu, 28 Dec 2023 13:45:56 +0000 Subject: [PATCH] rename all --- Makefile | 12 ++++++------ cmd/server/monarch-server.go | 5 ----- scripts/install-monarch.sh | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index e274e84..9a3e8f7 100644 --- a/Makefile +++ b/Makefile @@ -4,16 +4,16 @@ LDFLAGS = -s -w PROTOS = "pkg/protobuf" server: - GOOS=linux GOARCH=amd64 go build -ldflags="$(LDFLAGS)" -o monarch-linux_x64 cmd/monarch/monarch.go - GOOS=linux GOARCH=386 go build -ldflags="$(LDFLAGS)" -o monarch-linux_x86 cmd/monarch/monarch.go - GOOS=linux GOARCH=arm64 go build -ldflags="$(LDFLAGS)" -o monarch-linux_arm64 cmd/monarch/monarch.go - GOOS=linux GOARCH=arm go build -ldflags="$(LDFLAGS)" -o monarch-linux_arm cmd/monarch/monarch.go + GOOS=linux GOARCH=amd64 go build -ldflags="$(LDFLAGS)" -o monarch-linux_x64 cmd/server/monarch-server.go + GOOS=linux GOARCH=386 go build -ldflags="$(LDFLAGS)" -o monarch-linux_x86 cmd/server/monarch-server.go + GOOS=linux GOARCH=arm64 go build -ldflags="$(LDFLAGS)" -o monarch-linux_arm64 cmd/server/monarch-server.go + GOOS=linux GOARCH=arm go build -ldflags="$(LDFLAGS)" -o monarch-linux_arm cmd/server/monarch-server.go linux: GOOS=linux GOARCH=amd64 go build -ldflags="$(LDFLAGS)" -o monarch-client-linux_x64 cmd/client/monarch-client.go GOOS=linux GOARCH=386 go build -ldflags="$(LDFLAGS)" -o monarch-client-linux_x86 cmd/client/monarch-client.go - GOOS=linux GOARCH=arm64 go build -ldflags="$(LDFLAGS)" -o monarch-client-linux_arm64 cmd/monarch/monarch.go - GOOS=linux GOARCH=arm go build -ldflags="$(LDFLAGS)" -o monarch-client-linux_arm cmd/monarch/monarch.go + GOOS=linux GOARCH=arm64 go build -ldflags="$(LDFLAGS)" -o monarch-client-linux_arm64 cmd/client/monarch-client.go + GOOS=linux GOARCH=arm go build -ldflags="$(LDFLAGS)" -o monarch-client-linux_arm cmd/client/monarch-client.go macos: GOOS=darwin GOARCH=amd64 go build -ldflags="$(LDFLAGS)" -o monarch-client-macos_x64 cmd/client/monarch-client.go diff --git a/cmd/server/monarch-server.go b/cmd/server/monarch-server.go index 709f183..811240a 100644 --- a/cmd/server/monarch-server.go +++ b/cmd/server/monarch-server.go @@ -8,13 +8,8 @@ import ( "github.com/pygrum/monarch/pkg/console" ) -func init() { - -} - func main() { config.Initialize() - config.ClientConfig.Name = "console" db.Initialize() commands.ConsoleInitCTX() diff --git a/scripts/install-monarch.sh b/scripts/install-monarch.sh index 23bad12..5ef335e 100644 --- a/scripts/install-monarch.sh +++ b/scripts/install-monarch.sh @@ -95,7 +95,7 @@ echo "royal-lint saved to $HOME/.local/bin/royal-lint" echo "building monarch.." go build ../cmd/server/monarch-server.go -mv ./monarch "${HOME}/.local/bin" +mv ./monarch-server "${HOME}/.local/bin" echo "building monarch client..." go build ../cmd/client/monarch-client.go