diff options
| author | Peter Smit <peter@smitmail.eu> | 2015-02-09 12:27:15 +0200 |
|---|---|---|
| committer | Peter Smit <peter@smitmail.eu> | 2015-02-09 12:27:15 +0200 |
| commit | aa35be975f5058e5e4ba4d73725f6e16783ec69a (patch) | |
| tree | 31cebb5b67cc9da93fe4e27d5ad7f4233262845f | |
| parent | 6ed96b7a20b8b53ef958808cc414d59b72b7fa5c (diff) | |
| download | gitea-aa35be975f5058e5e4ba4d73725f6e16783ec69a.tar.gz gitea-aa35be975f5058e5e4ba4d73725f6e16783ec69a.zip | |
Fix #922
| -rw-r--r-- | models/publickey.go | 4 | ||||
| -rw-r--r-- | 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 ( |