From 39215683356bd8b25e9f233b607d1dfa3a95b197 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Tue, 13 Dec 2022 09:32:56 +0100 Subject: [PATCH 1/3] Replace Placeholders in Licenses --- modules/repository/init.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/repository/init.go b/modules/repository/init.go index 59284a5bafc81..2dd2131754495 100644 --- a/modules/repository/init.go +++ b/modules/repository/init.go @@ -13,6 +13,7 @@ import ( "sort" "strings" "time" + "strconv" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" @@ -282,6 +283,15 @@ func prepareRepoCommit(ctx context.Context, repo *repo_model.Repository, tmpDir, // LICENSE if len(opts.License) > 0 { data, err = GetRepoInitFile("license", opts.License) + + // Replace placeholders in License + data = bytes.ReplaceAll(data, []byte(""), []byte(repo.Name)) + data = bytes.ReplaceAll(data, []byte(""), []byte(repo.OwnerName)) + data = bytes.ReplaceAll(data, []byte(""), []byte(repo.OwnerName)) + data = bytes.ReplaceAll(data, []byte(""), []byte(repo.OwnerName)) + data = bytes.ReplaceAll(data, []byte(""), []byte(strconv.Itoa(time.Now().Year()))) + data = bytes.ReplaceAll(data, []byte(""), []byte(repo.Description)) + if err != nil { return fmt.Errorf("GetRepoInitFile[%s]: %w", opts.License, err) } From 18330c273442085f70bbe081cf84c2a82a03fc53 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Tue, 13 Dec 2022 09:41:51 +0100 Subject: [PATCH 2/3] Fix lint error --- modules/repository/init.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/repository/init.go b/modules/repository/init.go index 2dd2131754495..ece51adde8299 100644 --- a/modules/repository/init.go +++ b/modules/repository/init.go @@ -11,9 +11,9 @@ import ( "path" "path/filepath" "sort" + "strconv" "strings" "time" - "strconv" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" @@ -284,7 +284,7 @@ func prepareRepoCommit(ctx context.Context, repo *repo_model.Repository, tmpDir, if len(opts.License) > 0 { data, err = GetRepoInitFile("license", opts.License) - // Replace placeholders in License + // Replace Placeholders in License data = bytes.ReplaceAll(data, []byte(""), []byte(repo.Name)) data = bytes.ReplaceAll(data, []byte(""), []byte(repo.OwnerName)) data = bytes.ReplaceAll(data, []byte(""), []byte(repo.OwnerName)) From 7191a3e253e030063a80448abf71326e572bd8fd Mon Sep 17 00:00:00 2001 From: JakobDev Date: Mon, 2 Jan 2023 22:59:11 +0100 Subject: [PATCH 3/3] Add more placeholders --- modules/repository/init.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/repository/init.go b/modules/repository/init.go index ece51adde8299..c983935760ac9 100644 --- a/modules/repository/init.go +++ b/modules/repository/init.go @@ -286,10 +286,13 @@ func prepareRepoCommit(ctx context.Context, repo *repo_model.Repository, tmpDir, // Replace Placeholders in License data = bytes.ReplaceAll(data, []byte(""), []byte(repo.Name)) + data = bytes.ReplaceAll(data, []byte("[NAME]"), []byte(repo.OwnerName)) data = bytes.ReplaceAll(data, []byte(""), []byte(repo.OwnerName)) data = bytes.ReplaceAll(data, []byte(""), []byte(repo.OwnerName)) data = bytes.ReplaceAll(data, []byte(""), []byte(repo.OwnerName)) data = bytes.ReplaceAll(data, []byte(""), []byte(strconv.Itoa(time.Now().Year()))) + data = bytes.ReplaceAll(data, []byte("[YEAR]"), []byte(strconv.Itoa(time.Now().Year()))) + data = bytes.ReplaceAll(data, []byte("{YEAR}"), []byte(strconv.Itoa(time.Now().Year()))) data = bytes.ReplaceAll(data, []byte(""), []byte(repo.Description)) if err != nil {