From 5c80c014bfe430eb8522b56c67a5d6248556b4d2 Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Thu, 18 Apr 2019 16:59:55 +0200 Subject: [PATCH] fix: renamed project --- .editorconfig | 12 ++++++++++++ .gitattributes | 1 + .gitignore | 3 +-- Makefile | 36 +++++++++++++++++++++++++++++------- go.mod | 8 +++----- go.sum | 16 ++++------------ 6 files changed, 50 insertions(+), 26 deletions(-) create mode 100644 .editorconfig create mode 100644 .gitattributes diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..b53e68c --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +root = true + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = false + +[Makefile] +indent_style = tab \ No newline at end of file diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..dcd9d00 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +Makefile eol=lf \ No newline at end of file diff --git a/.gitignore b/.gitignore index 96d7291..0f0ce36 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -go-flucky -flucky \ No newline at end of file +flucky* \ No newline at end of file diff --git a/Makefile b/Makefile index a56d306..99a5f69 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,33 @@ +# UID/GID +# UID or GID is the UNIX user ID or group ID of the user who executes +# make. If the UID or GID is not passed as a make variable, an attempt +# is made to determine it. +UID?=$(shell id -u) +GID?=$(shell id -g) + +# VERSION +# If no version is specified as a parameter of make, the last git hash +# value is taken. VERSION ?= "$(shell git rev-parse --short HEAD)-git" -go-build-amd: - go build -o flucky -ldflags "-X main.version=${VERSION}" +# PHONY +# A phony target is one that is not really the name of a file; rather it +# is just a name for a recipe to be executed when you make an explicit +# request. +.PHONY: flucky flucky-amd64 flucky-arm -go-build-arm7: - GOOS=linux GOARCH=arm GOARM=7 go build -o flucky -ldflags "-X main.version=${VERSION}" +# default build +flucky: flucky-amd64 -pi-copy: go-build-arm7 - scp flucky poseidon:/usr/local/bin - ssh poseidon 'chmod +x /usr/local/bin/flucky' +# build flucky for amd64 architecture +flucky-amd64: + GOOS=linux \ + GOARCH=amd64 \ + go build -o flucky-amd64 -ldflags "-X main.version=${VERSION}" + +# build flucky for arm architecture +flucky-arm: + GOOS=linux \ + GOARCH=arm \ + GOARM=7 \ + go build -o fctl-arm -ldflags "-X main.version=${VERSION}" diff --git a/go.mod b/go.mod index 99672a7..78fd31b 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,11 @@ -module git.cryptic.systems/fh-trier/go-flucky +module github.com/volker-raschek/flucky go 1.12 require ( + git.cryptic.systems/fh-trier/go-flucky v0.0.0-20181207215028-500d1a5823bf + git.cryptic.systems/fh-trier/go-flucky-server v0.0.0-20181230151231-f6edecea614d // indirect github.com/MichaelS11/go-dht v0.0.0-20181004212404-be44b9ee7fec - github.com/d2r2/go-dht v0.0.0-20181222061613-42fe873fbabb // indirect - github.com/d2r2/go-logger v0.0.0-20181221090742-9998a510495e // indirect - github.com/d2r2/go-shell v0.0.0-20181221082743-874cb5c847b3 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/kr/pretty v0.1.0 // indirect github.com/satori/go.uuid v1.2.0 diff --git a/go.sum b/go.sum index adaa009..3fa3ea7 100644 --- a/go.sum +++ b/go.sum @@ -1,19 +1,12 @@ +git.cryptic.systems/fh-trier/go-flucky v0.0.0-20181207215028-500d1a5823bf h1:WM8TvicHgWrAn+CN0z5u2lkX0L4ejtK+rUckoucNad8= +git.cryptic.systems/fh-trier/go-flucky v0.0.0-20181207215028-500d1a5823bf/go.mod h1:yb5tRWqyFQ3CSgzOWTrvedu7QvpB+Z33+5xBR53ApHA= +git.cryptic.systems/fh-trier/go-flucky-server v0.0.0-20181230151231-f6edecea614d h1:F6PfcsO3KTND6nS+W1JIyQTZP0ELkpO4ZtsJLM1AkJk= +git.cryptic.systems/fh-trier/go-flucky-server v0.0.0-20181230151231-f6edecea614d/go.mod h1:WsdKW/cKXJboXNZduOxhD6y7NyhYN5E8eH6Jj5nDNNE= github.com/MichaelS11/go-dht v0.0.0-20181004212404-be44b9ee7fec h1:xMo0OOokExQqY/MRsTz6azUwy0udvlqhkJwQ5jZ6eN4= github.com/MichaelS11/go-dht v0.0.0-20181004212404-be44b9ee7fec/go.mod h1:NTx2rUi8kfs8Qk9Fotoyf/3lQnKBdc2mhyZqO4AhVLI= -github.com/d2r2/go-dht v0.0.0-20181222061613-42fe873fbabb h1:kyXaht4l/GxAWx0ubvha2QyVrtOgIx071o03tF3q60o= -github.com/d2r2/go-dht v0.0.0-20181222061613-42fe873fbabb/go.mod h1:AzSqP4S4/6pINOKg3VC79WC7YY3zskQcrXMFzphCry0= -github.com/d2r2/go-logger v0.0.0-20181221090742-9998a510495e h1:ZG3JBA6rPRl0xxQ+nNSfO7tor8w+CNCTs05DNJQYbLM= -github.com/d2r2/go-logger v0.0.0-20181221090742-9998a510495e/go.mod h1:oA+9PUt8F1aKJ6o4YU1T120i7sgo1T6/1LWEEBy0BSs= -github.com/d2r2/go-shell v0.0.0-20181221082743-874cb5c847b3 h1:A30Vp6lwq9bHnh4D7XRHZYOpuJq2/bbMs+B94Y8NeCc= -github.com/d2r2/go-shell v0.0.0-20181221082743-874cb5c847b3/go.mod h1:FdrNob+jQ3UkEpNVeZFVn8mW86Aa2wa6U5z0vGQOEXQ= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= @@ -23,7 +16,6 @@ github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/yryz/ds18b20 v0.0.0-20180211073435-3cf383a40624 h1:bePzgtpuLSl+F9aacwuaquuoOyKfMKuJORq2CvPPJK4= github.com/yryz/ds18b20 v0.0.0-20180211073435-3cf383a40624/go.mod h1:MqFju5qeLDFh+S9PqxYT7TEla8xeW7bgGr/69q3oki0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= periph.io/x/periph v3.4.0+incompatible h1:5gzxE4ryPq52cdqSw0mErR6pyJK8cBF2qdUAcOWh0bo= periph.io/x/periph v3.4.0+incompatible/go.mod h1:EWr+FCIU2dBWz5/wSWeiIUJTriYv9v2j2ENBmgYyy7Y=