1 Commits

Author SHA1 Message Date
James Mills
adfc2eaf7c Fixed scripts/release.sh to correctly produce linux binaries for both amd64 and arm64 2017-11-25 16:03:26 -08:00
12 changed files with 11 additions and 23 deletions

6
.gitmodules vendored
View File

@@ -43,9 +43,3 @@
[submodule "vendor/github.com/prometheus/procfs"] [submodule "vendor/github.com/prometheus/procfs"]
path = vendor/github.com/prometheus/procfs path = vendor/github.com/prometheus/procfs
url = https://github.com/prometheus/procfs url = https://github.com/prometheus/procfs
[submodule "vendor/github.com/sasha-s/go-deadlock"]
path = vendor/github.com/sasha-s/go-deadlock
url = https://github.com/sasha-s/go-deadlock
[submodule "vendor/github.com/petermattis/goid"]
path = vendor/github.com/petermattis/goid
url = https://github.com/petermattis/goid

View File

@@ -6,7 +6,7 @@ APP=eris
PACKAGE=irc PACKAGE=irc
REPO?=prologic/$(APP) REPO?=prologic/$(APP)
TAG?=latest TAG?=latest
BUILD?=dev BUILD?=-dev
all: dev all: dev

View File

@@ -68,7 +68,7 @@ func (store *MemoryPasswordStore) Verify(username, password string) error {
hash, ok := store.Get(username) hash, ok := store.Get(username)
if !ok { if !ok {
log.Debugf("username %s not found", username) log.Debugf("username %s not found", username)
return fmt.Errorf("account not found: %s", username) return fmt.Errorf("account not found: %S", username)
} }
return store.hasher.Compare(hash, []byte(password)) return store.hasher.Compare(hash, []byte(password))

View File

@@ -1,18 +1,14 @@
package irc package irc
import (
"fmt"
)
var ( var (
//PackageName package name //PackageName package name
Package = "eris" Package = "eris"
// Version release version // Version release version
Version = "1.6.1" Version = "1.6.0"
// Build will be overwritten automatically by the build system // Build will be overwritten automatically by the build system
Build = "dev" Build = "-dev"
// GitCommit will be overwritten automatically by the build system // GitCommit will be overwritten automatically by the build system
GitCommit = "HEAD" GitCommit = "HEAD"
@@ -20,5 +16,5 @@ var (
// FullVersion display the full version and build // FullVersion display the full version and build
func FullVersion() string { func FullVersion() string {
return fmt.Sprintf("%s-%s-%s@%s", Package, Version, Build, GitCommit) return Package + " v" + Version + Build + " (" + GitCommit + ")"
} }