From 8f273bbc2173edc597e539b4082323654ea6463e Mon Sep 17 00:00:00 2001 From: alexkappa Date: Tue, 1 Jul 2014 16:37:48 +0200 Subject: [PATCH 1/3] Adding a domain flag to set the domain name of the app. --- main.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/main.go b/main.go index 2aaa0ae..b45aa14 100644 --- a/main.go +++ b/main.go @@ -15,6 +15,7 @@ import ( "time" ) +var domainFlag = flag.String("domain", "gopkg.in", "The domain in which this app is used") var httpFlag = flag.String("http", ":8080", "Serve HTTP at given address") var httpsFlag = flag.String("https", "", "Serve HTTPS at given address") var certFlag = flag.String("cert", "", "Use the provided TLS certificate") @@ -104,15 +105,15 @@ func (repo *Repo) GopkgVersionRoot(version Version) string { v := version.String() if repo.OldFormat { if repo.User == "" { - return "gopkg.in/" + v + "/" + repo.Name + return *domainFlag + "/" + v + "/" + repo.Name } else { - return "gopkg.in/" + repo.User + "/" + v + "/" + repo.Name + return *domainFlag + "/" + repo.User + "/" + v + "/" + repo.Name } } else { if repo.User == "" { - return "gopkg.in/" + repo.Name + "." + v + return *domainFlag + "/" + repo.Name + "." + v } else { - return "gopkg.in/" + repo.User + "/" + repo.Name + "." + v + return *domainFlag + "/" + repo.User + "/" + repo.Name + "." + v } } } From 76c15c68ce3478f0756d4fe058d0129db9c3cf96 Mon Sep 17 00:00:00 2001 From: alexkappa Date: Tue, 1 Jul 2014 21:04:26 +0200 Subject: [PATCH 2/3] Added flag for github username. --- main.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index b45aa14..d15574a 100644 --- a/main.go +++ b/main.go @@ -15,11 +15,12 @@ import ( "time" ) -var domainFlag = flag.String("domain", "gopkg.in", "The domain in which this app is used") var httpFlag = flag.String("http", ":8080", "Serve HTTP at given address") var httpsFlag = flag.String("https", "", "Serve HTTPS at given address") var certFlag = flag.String("cert", "", "Use the provided TLS certificate") var keyFlag = flag.String("key", "", "Use the provided TLS key") +var domainFlag = flag.String("domain", "gopkg.in", "Domain name") +var githubFlag = flag.String("github", "", "Github username") func main() { if err := run(); err != nil { @@ -80,6 +81,9 @@ type Repo struct { // GitHubRoot returns the repository root at GitHub, without a schema. func (repo *Repo) GitHubRoot() string { + if *githubFlag != "" { + return "github.com/" + *githubFlag + "/" + repo.Name + } if repo.User == "" { return "github.com/go-" + repo.Name + "/" + repo.Name } else { From 44d1b902ee40386627d75083157ffc1ccf59e602 Mon Sep 17 00:00:00 2001 From: alexkappa Date: Tue, 27 Jan 2015 16:58:21 +0100 Subject: [PATCH 3/3] renamed github flag to username based on feedback --- main.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/main.go b/main.go index d15574a..f1dfb9c 100644 --- a/main.go +++ b/main.go @@ -20,7 +20,7 @@ var httpsFlag = flag.String("https", "", "Serve HTTPS at given address") var certFlag = flag.String("cert", "", "Use the provided TLS certificate") var keyFlag = flag.String("key", "", "Use the provided TLS key") var domainFlag = flag.String("domain", "gopkg.in", "Domain name") -var githubFlag = flag.String("github", "", "Github username") +var userFlag = flag.String("username", "", "Github username") func main() { if err := run(); err != nil { @@ -81,14 +81,13 @@ type Repo struct { // GitHubRoot returns the repository root at GitHub, without a schema. func (repo *Repo) GitHubRoot() string { - if *githubFlag != "" { - return "github.com/" + *githubFlag + "/" + repo.Name + if *userFlag != "" { + return "github.com/" + *userFlag + "/" + repo.Name } if repo.User == "" { return "github.com/go-" + repo.Name + "/" + repo.Name - } else { - return "github.com/" + repo.User + "/" + repo.Name } + return "github.com/" + repo.User + "/" + repo.Name } // GopkgRoot returns the package root at gopkg.in, without a schema.