From 4ca74860f562f58cc44ee72352fba1c54b37bc8f Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Mon, 10 Jun 2019 14:54:21 -0700 Subject: [PATCH] Dont include pngs in package. Fix version output. Lint slice. --- integrations/influxunifi/Makefile | 4 ++-- integrations/influxunifi/cmd/unifi-poller/main.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integrations/influxunifi/Makefile b/integrations/influxunifi/Makefile index 25f3ad59..9a592550 100644 --- a/integrations/influxunifi/Makefile +++ b/integrations/influxunifi/Makefile @@ -104,7 +104,7 @@ package_build_osx: man macos cp $(BINARY).macos $@/usr/local/bin/$(BINARY) cp *.1.gz $@/usr/local/share/man/man1 cp examples/*.conf.example $@/usr/local/etc/$(BINARY)/ - cp examples/* $@/usr/local/share/doc/$(BINARY)/ + cp examples/{*dash.json,up.conf.example} $@/usr/local/share/doc/$(BINARY)/ cp init/launchd/com.github.davidnewhall.$(BINARY).plist $@/Library/LaunchAgents/ # Build an environment that can be packaged for linux. @@ -117,7 +117,7 @@ package_build_linux: man linux cp *.1.gz $@/usr/share/man/man1 cp examples/*.conf.example $@/etc/$(BINARY)/ cp examples/up.conf.example $@/etc/$(BINARY)/up.conf - cp examples/* $@/usr/share/doc/$(BINARY)/ + cp examples/{*dash.json,up.conf.example} $@/usr/share/doc/$(BINARY)/ cp init/systemd/$(BINARY).service $@/lib/systemd/system/ check_fpm: diff --git a/integrations/influxunifi/cmd/unifi-poller/main.go b/integrations/influxunifi/cmd/unifi-poller/main.go index 066d5e48..f7a233e2 100644 --- a/integrations/influxunifi/cmd/unifi-poller/main.go +++ b/integrations/influxunifi/cmd/unifi-poller/main.go @@ -79,7 +79,7 @@ func parseFlags() string { configFile := flag.StringP("config", "c", defaultConfFile, "Poller Config File (TOML Format)") version := flag.BoolP("version", "v", false, "Print the version and exit") if flag.Parse(); *version { - fmt.Println("unifi-poller version:", Version) + fmt.Printf("unifi-poller v%s\n", Version) os.Exit(0) // don't run anything else. } return *configFile @@ -92,7 +92,7 @@ func (c *Config) CheckSites(controller *unifi.Unifi) error { return err } if !c.Quiet { - msg := make([]string, 0) + msg := []string{} for _, site := range sites { msg = append(msg, site.Name+" ("+site.Desc+")") }