From 456a38a24901fad9d1f0fb2fc5d72015f956bc9e Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Wed, 11 Mar 2015 10:28:19 -0700 Subject: [PATCH] Fix the `init` target - correct check for whether target file is present - correct `makefile.shade` filename - do not copy master and release config files into every repo --- makefile.shade | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/makefile.shade b/makefile.shade index e30467cd06..a6ee205346 100644 --- a/makefile.shade +++ b/makefile.shade @@ -123,13 +123,20 @@ var buildTarget = "compile" var sourceFile = Path.Combine(Directory.GetCurrentDirectory(), templatePath, fileName); // Don't update the makefile - if(fileName.Equals("makefile.shake", StringComparison.OrdinalIgnoreCase) && File.Exists(targetFile)) + if (fileName.Equals("makefile.shade", StringComparison.OrdinalIgnoreCase) && File.Exists(targetFile)) { continue; } - if(!File.Exists(sourceFile) || - (File.ReadAllText(sourceFile) != File.ReadAllText(targetFile))) + // Don't update extra configuration files + if (fileName.Equals("NuGet.master.config", StringComparison.OrdinalIgnoreCase) || + fileName.Equals("NuGet.release.config", StringComparison.OrdinalIgnoreCase)) + { + continue; + } + + if (!File.Exists(targetFile) || + (File.ReadAllText(sourceFile) != File.ReadAllText(targetFile))) { Log.Info("Updating " + fileName + " to " + repo); File.Copy(sourceFile, targetFile, true);