From 8f1891352a2f3296d5edf4ba7688d16ea2053266 Mon Sep 17 00:00:00 2001 From: Nikolaus Gotsche Date: Sat, 15 Sep 2018 10:58:27 +0200 Subject: Tried to force it for go 1.7 --- main.go | 2 +- makefile | 6 +++--- utils.go | 11 ++++++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/main.go b/main.go index 2974eb5..e0783ee 100644 --- a/main.go +++ b/main.go @@ -65,7 +65,7 @@ func init() { "Open a different Database than specified in Configuration") // CUSTOMIZE USAGE flag.Usage = func() { - fmt.Fprintf(os.Stderr, "Usage of %s Version %s (%s):\n %s [Options] args\n\n Arguments: use 'help' to get the full list \n\n [Options]:\n", os.Args[0],version,compdate,os.Args[0]) + fmt.Fprintf(os.Stderr, "Usage of %s Version %s (%s):\n %s [Options] \n\nOptions:\n", os.Args[0],version,compdate,os.Args[0]) flag.PrintDefaults() } diff --git a/makefile b/makefile index 821fc39..2ea7bdc 100755 --- a/makefile +++ b/makefile @@ -1,4 +1,4 @@ -version=$(shell git tag --points-at) +version=$(shell git tag --points-at HEAD) date=$(shell date "+%b %Y") name=laboravi .PHONY: all @@ -22,6 +22,6 @@ fetch_stuff: @go get github.com/fatih/color @go get github.com/mattn/go-sqlite3 @go get github.com/abiosoft/ishell - @mkdir outpdf - @mkdir outtex + @mkdir -p outpdf + @mkdir -p outtex @echo "All nessecary libaries installed" diff --git a/utils.go b/utils.go index 1400d63..c559b2e 100644 --- a/utils.go +++ b/utils.go @@ -133,8 +133,17 @@ func string2StringArray(in string,delim string)(out []string) { return } +func RetardRound(x float64) float64 { + t := math.Trunc(x) + if math.Abs(x-t) >= 0.5 { + return t + math.Copysign(1, x) + } + return t +} + func Round(x, unit float64) (float64) { - return math.Round(x/unit) * unit +// return math.Round(x/unit) * unit + return RetardRound(x/unit) * unit } func cleanString(in string) (out string) { -- cgit v1.2.3