Rename lql_api -> lql-api

Signed-off-by: pcdummy <pcdummy@ThinkPad-T410.pcdummy.lan>

Makefile

@@ -19,8 +19,8 @@ ifneq ($(shell git status --porcelain),)
 endif
 
 # Setup the -ldflags option for go build here, interpolate the variable values
-LDFLAGS=-ldflags '-w -s -X github.com/webmeisterei/lql_api/version.Version=${VERSION}'
-LDFLAGS_STATIC=-ldflags '-extldflags "-static" -w -s -X github.com/webmeisterei/lql_api/version.Version=${VERSION}'
+LDFLAGS=-ldflags '-w -s -X github.com/webmeisterei/lql-api/version.Version=${VERSION}'
+LDFLAGS_STATIC=-ldflags '-extldflags "-static" -w -s -X github.com/webmeisterei/lql-api/version.Version=${VERSION}'
 
 build:
 	go build -o ${BINARY} -a ${LDFLAGS}
@@ -36,7 +36,7 @@ install:
 
 .PHONY: debian
 debian:
-	GOPROXY= dpkg-buildpackage -us -uc
+	GOPROXY= dpkg-buildpackage -b -rfakeroot -us -uc
 
 # Cleans our project: deletes binaries
 clean:

README.md

@@ -1,4 +1,4 @@
-# lql_api
+# lql-api
 
 LQL API Server for check_mk
 

cmd/localclient.go

@@ -11,7 +11,7 @@ import (
 	"syscall"
 
 	"github.com/spf13/cobra"
-	"github.com/webmeisterei/lql_api/lql"
+	"github.com/webmeisterei/lql-api/lql"
 
 	log "github.com/sirupsen/logrus"
 )

cmd/localserver.go

@@ -7,7 +7,7 @@ import (
 	"syscall"
 
 	"github.com/spf13/cobra"
-	"github.com/webmeisterei/lql_api/lql"
+	"github.com/webmeisterei/lql-api/lql"
 
 	log "github.com/sirupsen/logrus"
 )

cmd/root.go

@@ -9,7 +9,7 @@ var (
 	cfgFile string
 
 	rootCmd = &cobra.Command{
-		Use:   "lql_api",
+		Use:   "lql-api",
 		Short: "Check_MK LQL API Client/Server",
 		Long:  ``,
 	}

cmd/sshclient.go

@@ -14,8 +14,8 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	myssh "github.com/webmeisterei/lql_api/internal/ssh"
-	"github.com/webmeisterei/lql_api/lql"
+	myssh "github.com/webmeisterei/lql-api/internal/ssh"
+	"github.com/webmeisterei/lql-api/lql"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
 

cmd/sshserver.go

@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	myssh "github.com/webmeisterei/lql_api/internal/ssh"
-	"github.com/webmeisterei/lql_api/lql"
+	myssh "github.com/webmeisterei/lql-api/internal/ssh"
+	"github.com/webmeisterei/lql-api/lql"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
 

cmd/version.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"github.com/webmeisterei/lql_api/version"
+	"github.com/webmeisterei/lql-api/version"
 )
 
 func init() {
@@ -16,6 +16,6 @@ var versionCmd = &cobra.Command{
 	Short: "Prints the version",
 	Long:  `Even I have a version`,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Printf("lql_api %s\n", version.Version)
+		fmt.Printf("lql-api %s\n", version.Version)
 	},
 }

debian/control

@@ -15,11 +15,11 @@ Build-Depends: debhelper-compat (= 12),
                golang-golang-x-crypto-dev,
                golang-logrus-dev
 Standards-Version: 4.5.0
-Vcs-Browser: https://github.com/webmeisterei/lql_api
-Vcs-Git: https://github.com/webmeisterei/lql_api.git
-Homepage: https://github.com/webmeisterei/lql_api
+Vcs-Browser: https://github.com/webmeisterei/lql-api
+Vcs-Git: https://github.com/webmeisterei/lql-api.git
+Homepage: https://github.com/webmeisterei/lql-api
 Rules-Requires-Root: no
-XS-Go-Import-Path: github.com/webmeisterei/lql_api
+XS-Go-Import-Path: github.com/webmeisterei/lql-api
 
 Package: lql-api
 Architecture: any
@@ -30,13 +30,6 @@ Description: LQL API Server for check_mk (program)
  LQL API Server for check_mk
  .
  See the LQL Docs (https://checkmk.com/cms_livestatus.html) for what LQL
- can do for you.  Commands the client supportslocalclient - Local LQL
- Client requires a local lql unix socket localserver: Local LQL Server
- requires a local lql unix socket sshclient: SSH LQL Client connects to
- your Server by SSH opens a SSH tunnel to the server's lql Socket and
- runs a query on it.  sshserver: SSH LQL Server Connects to your Server
- by SSH opens a SSH tunnel to the server's lql Socket and runs an API
- Server for that socket.  Version Prints the version OpenAPI 3.0 Support
- in sshserver and localserver This support's OpenAPI 3.0 use the url
- http://localhost:8080/openapi.json and browse it over an OpenAPI browser.
+ can do for you.
+ .
  License MIT - Copyright 2020 by Webmeisterei GmbH

debian/copyright

@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: lql_api
+Upstream-Name: lql-api
 Upstream-Contact: support@webmeisterei.com
-Source: https://github.com/webmeisterei/lql_api
+Source: https://github.com/webmeisterei/lql-api
 
 Files: *
 Copyright: 2020 Webmeisterei GmbH - Büro für Netzfragen

debian/files

@@ -0,0 +1,2 @@
+lql-api_0.0~git20200929.ca3764e-1_amd64.buildinfo devel optional
+lql-api_0.0~git20200929.ca3764e-1_amd64.deb devel optional

debian/lql-api.substvars

@@ -0,0 +1,4 @@
+shlibs:Depends=libc6 (>= 2.4)
+misc:Built-Using=golang-1.15 (= 1.15.2-1)
+misc:Depends=
+misc:Pre-Depends=

debian/rules

@@ -1,8 +1,33 @@
 #!/usr/bin/make -f
 
+TAG_COMMIT := $(shell git rev-list --abbrev-commit --tags --max-count=1)
+TAG := $(shell git describe --abbrev=0 --tags ${TAG_COMMIT} 2>/dev/null || true)
+COMMIT := $(shell git rev-parse --short HEAD)
+DATE := $(shell git log -1 --format=%cd --date=format:"%Y%m%d")
+VERSION := $(TAG:v%=%)
+ifeq ($(VERSION),)
+	VERSION := $(COMMIT)-$(DATE)
+else
+ifneq ($(COMMIT), $(TAG_COMMIT))
+	VERSION := $(VERSION)-next-$(COMMIT)-$(DATE)
+endif
+endif
+ifneq ($(shell git status --porcelain),)
+	VERSION := $(VERSION)-dirty
+endif
+
 %:
 	dh $@ --builddirectory=_build --buildsystem=golang --with=golang
 
+override_dh_auto_build:
+	dh_auto_build -- -ldflags '-w -s -X github.com/webmeisterei/lql-api/version.Version=${VERSION}'
+
+override_dh_auto_install:
+	dh_auto_install -- --no-source
+
+override_dh_installinit:
+	dh_installinit --noscripts
+
 override_dh_auto_install:
 	dh_auto_install -- --no-source
 	dh_installsystemd --no-start -- lql-api@.service

debian/watch

@@ -1,6 +1,6 @@
 version=4
 opts="mode=git, pgpmode=none" \
-  https://github.com/webmeisterei/lql_api.git \
+  https://github.com/webmeisterei/lql-api.git \
   HEAD debian
 
 # Use the following when upstream starts to tag releases:
@@ -8,4 +8,4 @@ opts="mode=git, pgpmode=none" \
 #version=4
 #opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%lql-api-$1.tar.gz%,\
 #      uversionmangle=s/(\d)[_\.\-\+]?(RC|rc|pre|dev|beta|alpha)[.]?(\d*)$/\$1~\$2\$3/" \
-#  https://github.com/webmeisterei/lql_api/tags .*/v?(\d\S*)\.tar\.gz debian
+#  https://github.com/webmeisterei/lql-api/tags .*/v?(\d\S*)\.tar\.gz debian

go.mod

@@ -1,4 +1,4 @@
-module github.com/webmeisterei/lql_api
+module github.com/webmeisterei/lql-api
 
 go 1.15
 

lql/client.go

@@ -11,8 +11,8 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	"github.com/webmeisterei/lql_api/internal/gncp"
-	"github.com/webmeisterei/lql_api/internal/utils"
+	"github.com/webmeisterei/lql-api/internal/gncp"
+	"github.com/webmeisterei/lql-api/internal/utils"
 
 	log "github.com/sirupsen/logrus"
 )

main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/webmeisterei/lql_api/cmd"
+	"github.com/webmeisterei/lql-api/cmd"
 )
 
 // @title LQL API
@@ -9,11 +9,11 @@ import (
 // @description This is the LQL API for your check_mk Server.
 
 // @contact.name Developers
-// @contact.url https://github.com/webmeisterei/lql_api/issues
+// @contact.url https://github.com/webmeisterei/lql-api/issues
 // @contact.email support@webmeisterei.com
 
 // @license.name MIT
-// @license.url https://github.com/webmeisterei/lql_api/blob/master/LICENSE
+// @license.url https://github.com/webmeisterei/lql-api/blob/master/LICENSE
 
 // @BasePath /v1
 func main() {