octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-09 14:50:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/versioner: Replace multiple placeholders in a single token in external command (fixes #5849)

Browse Source 
* lib/versioner: Add placeholder to provide the absolute file path to external commands

This commit adds support for a new placeholder, %FILE_PATH_FULL%, to the
command of the external versioner. The placeholder will be replaced by
the absolute path of the file that should be deleted.

* Revert "lib/versioner: Add placeholder to provide the absolute file path to external commands"

This reverts commit fb48962b947358e90a76e87a7794adb6057de476.

* lib/versioner: Replace all placeholders in external command (fixes #5849)

Before this commit, only these placeholders were replaced that span a
whole word, for example "%FOLDER_PATH%". Words that consisted of more
than one placeholder or additional characters, for example
"%FOLDER_PATH%/%FILE_PATH%", were left untouched.

* fixup! lib/versioner: Replace all placeholders in external command (fixes #5849)
This commit is contained in:
xduugu 2019-07-12 07:45:39 +00:00 committed by Audrius Butkevicius
parent 3446d50201
commit 4b3f9b1af9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/versioner/external.go
View File

@ -77,9 +77,11 @@ func (v External) Archive(filePath string) error {
} }
for i, word := range words { for i, word := range words {
if replacement, ok := context[word]; ok { for key, val := range context {
words[i] = replacement word = strings.Replace(word, key, val, -1)
} }
words[i] = word
} }
cmd := exec.Command(words[0], words[1:]...) cmd := exec.Command(words[0], words[1:]...)