diff options
| author | 无闻 <u@gogs.io> | 2015-02-09 10:45:41 -0500 |
|---|---|---|
| committer | 无闻 <u@gogs.io> | 2015-02-09 10:45:41 -0500 |
| commit | 767bf82eabed0fede7bbdb5f5b1c75898c6ff00d (patch) | |
| tree | cdea12b284619fde82114e77d1f87e1e1f191fd9 /models | |
| parent | 6ed96b7a20b8b53ef958808cc414d59b72b7fa5c (diff) | |
| parent | b7e26aa5e30360897ea51d49f6d977ac0562431d (diff) | |
| download | gitea-767bf82eabed0fede7bbdb5f5b1c75898c6ff00d.tar.gz gitea-767bf82eabed0fede7bbdb5f5b1c75898c6ff00d.zip | |
Merge pull request #923 from phsmit/fix_922
Fix #922
Diffstat (limited to 'models')
| -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 ( |