fixes

6 files changed, 14 insertions, 14 deletions

diff --git a/Dockerfile b/Dockerfile
index c8c310e..7f83329 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,8 +8,6 @@ RUN go mod download
 COPY . .
 RUN go test ./...
 RUN GOBIN=/x/bin go install -v ./...
-RUN apk --no-cache add upx \
- && upx /x/bin/*
 
 FROM xena/alpine
 COPY --from=build /x/bin/ /usr/local/bin/
diff --git a/cmd/genua/main.go b/cmd/genua/main.go
index 376dbe9..1ff8516 100644
--- a/cmd/genua/main.go
+++ b/cmd/genua/main.go
@@ -2,11 +2,19 @@
 package main
 
 import (
+	"flag"
 	"fmt"
+	"log"
 
-	"within.website/x/web"
+	"within.website/x/web/useragent"
 )
 
 func main() {
-	fmt.Println(web.GenUserAgent())
+	flag.Parse()
+
+	if flag.NArg() != 2 {
+		log.Fatal("usage: genua <prefix> <infoURL>")
+	}
+
+	fmt.Println(useragent.GenUserAgent(flag.Arg(0), flag.Arg(1)))
 }
diff --git a/docker.go b/docker.go
index cda5cb9..1157e39 100644
--- a/docker.go
+++ b/docker.go
@@ -38,18 +38,12 @@ func main() {
 	yeet.DockerBuild(ctx, filepath.Join(yeet.WD, "cmd", "dnsd"), dnsdTag, "--build-arg", "X_VERSION="+gitTag)
 	dnsdGithubTag := yeet.DockerTag(ctx, "docker.pkg.github.com/xe/x", "dnsd", dnsdTag)
 
-	hTag := "docker.pkg.github.com/xe/x/h:" + gitTag
-
-	yeet.DockerBuild(ctx, filepath.Join(yeet.WD, "cmd", "h"), hTag, "--build-arg", "X_VERSION="+gitTag)
-
 	if !*dontPush {
 		yeet.ShouldWork(ctx, nil, yeet.WD, "docker", "push", resTag)
 		yeet.ShouldWork(ctx, nil, yeet.WD, "docker", "push", otherResTag)
 		yeet.ShouldWork(ctx, nil, yeet.WD, "docker", "push", dnsdGithubTag)
-		yeet.ShouldWork(ctx, nil, yeet.WD, "docker", "push", hTag)
 	}
 
 	log.Printf("xperimental:\t%s", otherResTag)
 	log.Printf("dnsd:\t%s", dnsdGithubTag)
-	log.Printf("h:\t\t%s", hTag)
 }
diff --git a/go.mod b/go.mod
index 078edc1..4c68a29 100644
--- a/go.mod
+++ b/go.mod
@@ -61,11 +61,11 @@ require (
 	github.com/xtaci/smux v1.4.4
 	github.com/yawning/bulb v0.0.0-20170405033506-85d80d893c3d // indirect
 	go4.org v0.0.0-20190313082347-94abd6928b1d
-	golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472
+	golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392
 	golang.org/x/exp/errors v0.0.0-20190510132918-efd6b22b2522
 	golang.org/x/image v0.0.0-20190523035834-f03afa92d3ff // indirect
 	golang.org/x/mod v0.1.0
-	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297
+	golang.org/x/net v0.0.0-20190923162816-aa69164e4478
 	golang.org/x/oauth2 v0.0.0-20190523182746-aaccbc9213b0
 	google.golang.org/appengine v1.6.0 // indirect
 	gopkg.in/tucnak/telebot.v2 v2.0.0-20190415090633-8c1c512262f2
diff --git a/web/useragent/user_agent.go b/web/useragent/user_agent.go
index 0f521c9..289bc88 100644
--- a/web/useragent/user_agent.go
+++ b/web/useragent/user_agent.go
@@ -38,6 +38,6 @@ type userAgentTransport struct {
 }
 
 func (uat userAgentTransport) RoundTrip(r *http.Request) (*http.Response, error) {
-	r.Header.Set("User-Agent", GenUserAgent(uat.prefix))
+	r.Header.Set("User-Agent", GenUserAgent(uat.prefix, uat.infoURL))
 	return uat.rt.RoundTrip(r)
 }
diff --git a/web/useragent/user_agent_test.go b/web/useragent/user_agent_test.go
index 702bcf7..4346029 100644
--- a/web/useragent/user_agent_test.go
+++ b/web/useragent/user_agent_test.go
@@ -3,7 +3,7 @@ package useragent
 import "testing"
 
 func TestGenUserAgent(t *testing.T) {
-	ua := GenUserAgent()
+	ua := GenUserAgent("test", "https://christine.website")
 	if ua == "" {
 		t.Fatal("no user agent generated")
 	}