From aa35be975f5058e5e4ba4d73725f6e16783ec69a Mon Sep 17 00:00:00 2001 From: Peter Smit Date: Mon, 9 Feb 2015 12:27:15 +0200 Subject: [PATCH 1/2] Fix #922 --- models/publickey.go | 4 ++-- models/repo.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/models/publickey.go b/models/publickey.go index b1c7b62449..383b85b634 100644 --- a/models/publickey.go +++ b/models/publickey.go @@ -29,7 +29,7 @@ import ( const ( // "### autogenerated by gitgos, DO NOT EDIT\n" - _TPL_PUBLICK_KEY = `command="%s serv --config='%s' key-%d",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty %s` + "\n" + _TPL_PUBLICK_KEY = `command="%s serv key-%d --config='%s'",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty %s` + "\n" ) var ( @@ -98,7 +98,7 @@ func (k *PublicKey) OmitEmail() string { // GetAuthorizedString generates and returns formatted public key string for authorized_keys file. func (key *PublicKey) GetAuthorizedString() string { - return fmt.Sprintf(_TPL_PUBLICK_KEY, appPath, setting.CustomConf, key.Id, key.Content) + return fmt.Sprintf(_TPL_PUBLICK_KEY, appPath, key.Id, setting.CustomConf, key.Content) } var ( diff --git a/models/repo.go b/models/repo.go index f2f10baff0..64c152dd8d 100644 --- a/models/repo.go +++ b/models/repo.go @@ -30,7 +30,7 @@ import ( ) const ( - _TPL_UPDATE_HOOK = "#!/usr/bin/env %s\n%s update --config='%s' $1 $2 $3\n" + _TPL_UPDATE_HOOK = "#!/usr/bin/env %s\n%s update $1 $2 $3 --config='%s'\n" ) var ( From b7e26aa5e30360897ea51d49f6d977ac0562431d Mon Sep 17 00:00:00 2001 From: Peter Smit Date: Mon, 9 Feb 2015 12:32:42 +0200 Subject: [PATCH 2/2] Improve argument parsing for serve command --- cmd/serve.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/serve.go b/cmd/serve.go index 28fd40134a..25f7dd9191 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -90,7 +90,10 @@ func runServ(k *cli.Context) { } setup("serv.log") - keys := strings.Split(os.Args[2], "-") + if len(k.Args()) < 1 { + log.GitLogger.Fatal(2, "Not enough arguments") + } + keys := strings.Split(k.Args()[0], "-") if len(keys) != 2 { println("Gogs: auth file format error") log.GitLogger.Fatal(2, "Invalid auth file format: %s", os.Args[2])