mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2025-04-26 13:34:45 +00:00
Merge pull request #694 from bradrydzewski/master
reverse sorting private params when injecting, #692
This commit is contained in:
commit
2d7e345eac
1 changed files with 8 additions and 1 deletions
|
@ -1,6 +1,7 @@
|
||||||
package script
|
package script
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -8,8 +9,14 @@ func Inject(script string, params map[string]string) string {
|
||||||
if params == nil {
|
if params == nil {
|
||||||
return script
|
return script
|
||||||
}
|
}
|
||||||
|
keys := []string{}
|
||||||
|
for k, _ := range params {
|
||||||
|
keys = append(keys, k)
|
||||||
|
}
|
||||||
|
sort.Sort(sort.Reverse(sort.StringSlice(keys)))
|
||||||
injected := script
|
injected := script
|
||||||
for k, v := range params {
|
for _, k := range keys {
|
||||||
|
v := params[k]
|
||||||
injected = strings.Replace(injected, "$$"+k, v, -1)
|
injected = strings.Replace(injected, "$$"+k, v, -1)
|
||||||
}
|
}
|
||||||
return injected
|
return injected
|
||||||
|
|
Loading…
Reference in a new issue