Skip to content

Commit

Permalink
Fix version command and executable name. (#2)
Browse files Browse the repository at this point in the history
  • Loading branch information
sb10 authored Aug 23, 2024
1 parent 7c3dc87 commit a39a716
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 23 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PKG := github.com/wtsi-ssg/wrstat-ui/v1
PKG := github.com/wtsi-hgi/wrstat-ui
VERSION := $(shell git describe --tags --always --long --dirty)
TAG := $(shell git describe --abbrev=0 --tags)
LDFLAGS = -ldflags "-X ${PKG}/cmd.Version=${VERSION}"
Expand All @@ -22,16 +22,16 @@ buildnonpm:

install: export CGO_ENABLED = 1
install:
@rm -f ${GOPATH}/bin/wrstat
@rm -f ${GOPATH}/bin/wrstat-ui
@cd server/static/wrstat; npm install && npm run build:prod
@echo Starting go install
@go install -tags netgo ${LDFLAGS}
@echo Installed to ${GOPATH}/bin/wrstat-ui

installnonpm: export CGO_ENABLED = 1
installnonpm:
@rm -f ${GOPATH}/bin/wrstat
@go install -tags netgo ${LDFLAGS}
@rm -f ${GOPATH}/bin/wrstat-ui
go install -tags netgo ${LDFLAGS}
@echo installed to ${GOPATH}/bin/wrstat-ui

test: export CGO_ENABLED = 1
Expand Down
2 changes: 1 addition & 1 deletion cmd/dbinfo.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"log/slog"

"github.com/spf13/cobra"
"github.com/wtsi-hgi/wrstat-ui/v1/server"
"github.com/wtsi-hgi/wrstat-ui/server"
"github.com/wtsi-ssg/wrstat/v5/basedirs"
"github.com/wtsi-ssg/wrstat/v5/dgut"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (

"github.com/inconshreveable/log15"
"github.com/spf13/cobra"
"github.com/wtsi-hgi/wrstat-ui/v1/server"
"github.com/wtsi-hgi/wrstat-ui/server"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions cmd/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ import (
)

// Version gets set during build:
// go build -ldflags "-X github.com/wtsi-ssg/wrstat/cmd.Version=`git describe --tags --always --long --dirty`" .
// go build -ldflags "-X github.com/wtsi-hgi/wrstat-ui/cmd.Version=`git describe --tags --always --long --dirty`" .
var Version string

// versionCmd represents the version command.
var versionCmd = &cobra.Command{
Use: "version",
Short: "Print wrstat version",
Long: `Print wrstat version.`,
Short: "Print wrstat-ui version",
Long: `Print wrstat-ui version.`,
Run: func(cmd *cobra.Command, args []string) {

Check warning on line 43 in cmd/version.go

View workflow job for this annotation

GitHub Actions / lint

unused-parameter: parameter 'cmd' seems to be unused, consider removing or renaming it as _ (revive)
fmt.Println(Version)
},
Expand Down
2 changes: 1 addition & 1 deletion cmd/where.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import (
"github.com/olekukonko/tablewriter"
"github.com/spf13/cobra"
gas "github.com/wtsi-hgi/go-authserver"
"github.com/wtsi-hgi/wrstat-ui/v1/server"
"github.com/wtsi-hgi/wrstat-ui/server"
)

type Error string
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/wtsi-hgi/wrstat-ui/v1
module github.com/wtsi-hgi/wrstat-ui

go 1.22

Expand Down
2 changes: 1 addition & 1 deletion internal/db/basedirs.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ package internaldb
import (
"testing"

internaldata "github.com/wtsi-hgi/wrstat-ui/v1/internal/data"
internaldata "github.com/wtsi-hgi/wrstat-ui/internal/data"
"github.com/wtsi-ssg/wrstat/v5/dgut"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/db/dgut.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ import (
"testing"
"time"

internaldata "github.com/wtsi-hgi/wrstat-ui/v1/internal/data"
"github.com/wtsi-hgi/wrstat-ui/v1/internal/fs"
internaldata "github.com/wtsi-hgi/wrstat-ui/internal/data"
"github.com/wtsi-hgi/wrstat-ui/internal/fs"
"github.com/wtsi-ssg/wrstat/v5/dgut"
)

Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
package main

import (
"github.com/wtsi-hgi/wrstat-ui/v1/cmd"
"github.com/wtsi-hgi/wrstat-ui/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion server/basedirs.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (

"github.com/gin-gonic/gin"
gas "github.com/wtsi-hgi/go-authserver"
ifs "github.com/wtsi-hgi/wrstat-ui/v1/internal/fs"
ifs "github.com/wtsi-hgi/wrstat-ui/internal/fs"
"github.com/wtsi-ssg/wrstat/v5/basedirs"
"github.com/wtsi-ssg/wrstat/v5/watch"
)
Expand Down
2 changes: 1 addition & 1 deletion server/dgutdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"path/filepath"
"time"

ifs "github.com/wtsi-hgi/wrstat-ui/v1/internal/fs"
ifs "github.com/wtsi-hgi/wrstat-ui/internal/fs"
"github.com/wtsi-ssg/wrstat/v5/dgut"
"github.com/wtsi-ssg/wrstat/v5/watch"
)
Expand Down
10 changes: 5 additions & 5 deletions server/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ import (
"github.com/gin-gonic/gin"
. "github.com/smartystreets/goconvey/convey"
gas "github.com/wtsi-hgi/go-authserver"
internaldata "github.com/wtsi-hgi/wrstat-ui/v1/internal/data"
internaldb "github.com/wtsi-hgi/wrstat-ui/v1/internal/db"
"github.com/wtsi-hgi/wrstat-ui/v1/internal/fixtimes"
ifs "github.com/wtsi-hgi/wrstat-ui/v1/internal/fs"
"github.com/wtsi-hgi/wrstat-ui/v1/internal/split"
internaldata "github.com/wtsi-hgi/wrstat-ui/internal/data"
internaldb "github.com/wtsi-hgi/wrstat-ui/internal/db"
"github.com/wtsi-hgi/wrstat-ui/internal/fixtimes"
ifs "github.com/wtsi-hgi/wrstat-ui/internal/fs"
"github.com/wtsi-hgi/wrstat-ui/internal/split"
"github.com/wtsi-ssg/wrstat/v5/basedirs"
"github.com/wtsi-ssg/wrstat/v5/dgut"
)
Expand Down
2 changes: 1 addition & 1 deletion server/where.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"strconv"

"github.com/gin-gonic/gin"
"github.com/wtsi-hgi/wrstat-ui/v1/internal/split"
"github.com/wtsi-hgi/wrstat-ui/internal/split"
)

const (
Expand Down

0 comments on commit a39a716

Please sign in to comment.