test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

Fix #237

This commit is contained in:
Unknown 2014-06-03 21:51:25 -04:00
parent 63baf76ab2
commit 11f9d738e8
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
models/repo.go
View File

@ -489,22 +489,40 @@ func initRepository(f string, user *User, repo *Repository, initReadme bool, rep
// .gitignore // .gitignore
if repoLang != "" { if repoLang != "" {
filePath := "conf/gitignore/" + repoLang filePath := "conf/gitignore/" + repoLang
if com.IsFile(filePath) { targetPath := path.Join(tmpDir, fileName["gitign"])
if err := com.Copy(filePath, data, err := bin.Asset(filePath)
filepath.Join(tmpDir, fileName["gitign"])); err != nil { if err == nil {
if err = ioutil.WriteFile(targetPath, data, os.ModePerm); err != nil {
return err return err
} }
} else {
// Check custom files.
filePath = path.Join(setting.CustomPath, "conf/gitignore", repoLang)
if com.IsFile(filePath) {
if err := com.Copy(filePath, targetPath); err != nil {
return err
}
}
} }
} }
// LICENSE // LICENSE
if license != "" { if license != "" {
filePath := "conf/license/" + license filePath := "conf/license/" + license
if com.IsFile(filePath) { targetPath := path.Join(tmpDir, fileName["license"])
if err := com.Copy(filePath, data, err := bin.Asset(filePath)
filepath.Join(tmpDir, fileName["license"])); err != nil { if err == nil {
if err = ioutil.WriteFile(targetPath, data, os.ModePerm); err != nil {
return err return err
} }
} else {
// Check custom files.
filePath = path.Join(setting.CustomPath, "conf/license", license)
if com.IsFile(filePath) {
if err := com.Copy(filePath, targetPath); err != nil {
return err
}
}
} }
} }