Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 7284736

Browse files
authored
Merge pull request #172 from github-for-unity/fixes/yaml-merge-arguments
Fixing args for yaml merge command
2 parents 0a7f769 + 6c38ca8 commit 7284736

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/GitHub.Api/Application/ApplicationManagerBase.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ public ITask InitializeRepository()
8080
var targetPath = NPath.CurrentDirectory;
8181

8282
var unityYamlMergeExec = Environment.UnityApplication.Parent.Combine("Tools", "UnityYAMLMerge");
83-
var yamlMergeCommand = $@"'{unityYamlMergeExec}' merge -p ""$BASE"" ""$REMOTE"" ""$LOCAL"" ""$MERGED""";
83+
var yamlMergeCommand = Environment.IsWindows
84+
? $@"'{unityYamlMergeExec}' merge -p ""$BASE"" ""$REMOTE"" ""$LOCAL"" ""$MERGED"""
85+
: $@"'{unityYamlMergeExec}' merge -p '$BASE' '$REMOTE' '$LOCAL' '$MERGED'";
8486

8587
var gitignore = targetPath.Combine(".gitignore");
8688
var gitAttrs = targetPath.Combine(".gitattributes");

0 commit comments

Comments
 (0)