diff --git a/.metadata.sh b/.metadata.sh index a3346a21..fe0f91d1 100755 --- a/.metadata.sh +++ b/.metadata.sh @@ -4,8 +4,6 @@ # Must match the repo name. BINARY="unifi-poller" -# github username -GHUSER="davidnewhall" # Github repo containing homebrew formula repo. HBREPO="golift/homebrew-mugs" MAINT="David Newhall II " @@ -19,14 +17,14 @@ LICENSE="MIT" # This affects the homebrew formula (launchd) and linux packages (systemd). FORMULA="service" -export BINARY GHUSER HBREPO MAINT VENDOR DESC GOLANGCI_LINT_ARGS CONFIG_FILE LICENSE FORMULA +export BINARY HBREPO MAINT VENDOR DESC GOLANGCI_LINT_ARGS CONFIG_FILE LICENSE FORMULA # The rest is mostly automatic. # Fix the repo if it doesn't match the binary name. # Provide a better URL if one exists. # Used for source links and wiki links. -SOURCE_URL="https://github.com/${GHUSER}/${BINARY}" +SOURCE_URL="https://github.com/${BINARY}/${BINARY}" # Used for documentation links. URL="${SOURCE_URL}" diff --git a/go.mod b/go.mod index c1c17696..f4c894bb 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/unifi-poller/unifi-poller go 1.13 require ( - github.com/unifi-poller/influxunifi v0.0.3 - github.com/unifi-poller/inputunifi v0.0.2 - github.com/unifi-poller/poller v0.0.2 - github.com/unifi-poller/promunifi v0.0.2 + github.com/unifi-poller/influxunifi v0.0.4-0.20191229230645-c06bd4afccad + github.com/unifi-poller/inputunifi v0.0.3-0.20191230031314-6714bca5a703 + github.com/unifi-poller/poller v0.0.3-0.20191229090254-3d0ea938dfc4 + github.com/unifi-poller/promunifi v0.0.3-0.20191229230625-e67c9d7605c8 ) diff --git a/go.sum b/go.sum index 46cb23ae..88d25dca 100644 --- a/go.sum +++ b/go.sum @@ -67,12 +67,22 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/unifi-poller/influxunifi v0.0.3 h1:/3Ua1g5Z1toLxulb3Z4VflLWhUDh+/P8XboGl1YqDK4= github.com/unifi-poller/influxunifi v0.0.3/go.mod h1:abAL5gE+1KSmZ9nNKwjSBTmVffU1yN1KTDwPKOSpgh8= +github.com/unifi-poller/influxunifi v0.0.4-0.20191229230645-c06bd4afccad h1:jyMZJsZNPv7x/UTaOmMyqdRc/290v6KipEeW0cr4aNY= +github.com/unifi-poller/influxunifi v0.0.4-0.20191229230645-c06bd4afccad/go.mod h1:abAL5gE+1KSmZ9nNKwjSBTmVffU1yN1KTDwPKOSpgh8= github.com/unifi-poller/inputunifi v0.0.2 h1:oCBu+K3VmKjrEfti7b30m3p/eh3ERZG2xp60eL7s6LE= github.com/unifi-poller/inputunifi v0.0.2/go.mod h1:aCDjO48d2xgj2zJalcD9ZheASrAYT+lgdsa2mO783eE= +github.com/unifi-poller/inputunifi v0.0.3-0.20191229230346-7226454a2b55 h1:LEhiYG1KtaOikcPOJoltWFv63/+X/puP/Cj6cnU71nM= +github.com/unifi-poller/inputunifi v0.0.3-0.20191229230346-7226454a2b55/go.mod h1:aCDjO48d2xgj2zJalcD9ZheASrAYT+lgdsa2mO783eE= +github.com/unifi-poller/inputunifi v0.0.3-0.20191230031314-6714bca5a703 h1:A/utQrJXY9CxtRQbvMjGXJFe1ayzS1UzzeLIOv4U3m8= +github.com/unifi-poller/inputunifi v0.0.3-0.20191230031314-6714bca5a703/go.mod h1:aCDjO48d2xgj2zJalcD9ZheASrAYT+lgdsa2mO783eE= github.com/unifi-poller/poller v0.0.2 h1:qUDSon8UIqRYOXd+V+3jThf2CSE/glQK8MSDmp20STU= github.com/unifi-poller/poller v0.0.2/go.mod h1:H1YErnDRLaUQBH09kzd7kNTL3bMNCPuYbg94aJBun7Y= +github.com/unifi-poller/poller v0.0.3-0.20191229090254-3d0ea938dfc4 h1:LV8RbR7zBHIqR7G3EO/TyzJ2Hfz+FI40WgAy9Fd47o4= +github.com/unifi-poller/poller v0.0.3-0.20191229090254-3d0ea938dfc4/go.mod h1:H1YErnDRLaUQBH09kzd7kNTL3bMNCPuYbg94aJBun7Y= github.com/unifi-poller/promunifi v0.0.2 h1:NZUJT6CdZkQPNKzjC+lUeZQ/N20njZGIidbAD0pVU0Q= github.com/unifi-poller/promunifi v0.0.2/go.mod h1:CdEWjrtoF9Z4XyeR/ueAgs8ZswiV0K6rHsybcMRu9jA= +github.com/unifi-poller/promunifi v0.0.3-0.20191229230625-e67c9d7605c8 h1:gUAvyaSriSYRHNfoVdL2mIVCOtjVjOzKbcGPh80rT5U= +github.com/unifi-poller/promunifi v0.0.3-0.20191229230625-e67c9d7605c8/go.mod h1:CdEWjrtoF9Z4XyeR/ueAgs8ZswiV0K6rHsybcMRu9jA= github.com/unifi-poller/unifi v0.0.1 h1:8LTf0RyxMdDLmzm59mk7bz5/qfC1hHmC21u/uqx2vSQ= github.com/unifi-poller/unifi v0.0.1/go.mod h1:DagVD/I+VMnVUHmTT4Fi76lPI+DHbuMwwtMIzanwMxM= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -86,6 +96,7 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191220142924-d4481acd189f h1:68K/z8GLUxV76xGSqwTWw2gyk/jwn79LUL43rES2g8o= golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golift.io/cnfg v0.0.5 h1:HnMU8Z9C/igKvir1dqaHx5BPuNGZrp99FCtdJyP2Z4I= diff --git a/init/docker/hooks/push b/init/docker/hooks/push index d3f8e184..d345b007 100755 --- a/init/docker/hooks/push +++ b/init/docker/hooks/push @@ -25,11 +25,11 @@ done echo "Annotating Images: ${IMAGES}" # Build all the Docker tags if the source branch is a release and not a branch. -if [ "v$VERSION" == "$SOURCE_BRANCH" ]; then +if [ "v$VERSION" = "$SOURCE_BRANCH" ]; then TAGS="$VERSION $(echo $VERSION | cut -d. -f1,2)" echo $SOURCE_BRANCH | grep -q -- - - if [ "$?" == "1" ]; then + if [ "$?" = "1" ]; then # tag does not contain a dash, so assume it's a prod tag. TAGS="$TAGS latest stable" fi