From b20196557abf519843f67118ffe5b9b0069126e5 Mon Sep 17 00:00:00 2001
From: Rob Reynolds <ferventcoder@gmail.com>
Date: Sun, 24 May 2020 08:26:55 -0500
Subject: [PATCH] (GH-2055) remove logs/config folder in nupkg

When building choco for official release, Chocolatey uses the machine
installation location for writing out logs and checking for the
existence of a config file. When in a non-official release, it uses
the output folder, which means it will be packaged up inside the
package. This is bad because it later overwrites the existing log
files, and it overwrites the config, resetting/removing any settings
one may be depending on. This only affects a non-official release, or
releases that are used for testing.

Ensure the logs/config folders are removed and not packaged into the
nuget packaging.
---
 .build.custom/nugetPrepare.post.step | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.build.custom/nugetPrepare.post.step b/.build.custom/nugetPrepare.post.step
index 0af391a04b..f20f6f7b7b 100644
--- a/.build.custom/nugetPrepare.post.step
+++ b/.build.custom/nugetPrepare.post.step
@@ -12,7 +12,7 @@
   <property name="build.step.path" value="${project::get-buildfile-path()}" />
   <!-- build step customizations below this -->
 
-  <target name="go" depends="prep_nuget, unpack_files, copy_legal" />
+  <target name="go" depends="prep_nuget, unpack_files, copy_legal, remove_logs_config_folders" />
 
   <target name="prep_nuget">
     <echo level="Warning" message="Moving ${dirs.drop.nuget}${path.separator}lib${path.separator}console to ${dirs.drop.nuget}${path.separator}chocolatey${path.separator}tools${path.separator}chocolateyInstall." />
@@ -48,4 +48,11 @@
     <copy file="${dirs.current}${path.separator}${folder.documentation}${path.separator}legal${path.separator}CREDITS.md" tofile="${dirs.drop.nuget}${path.separator}chocolatey${path.separator}tools${path.separator}chocolateyInstall${path.separator}CREDITS.txt" failonerror="true" />
     <copy file="${dirs.current}${path.separator}${folder.documentation}${path.separator}legal${path.separator}CREDITS.md" tofile="${dirs.drop.nuget}${path.separator}chocolatey.lib${path.separator}lib${path.separator}CREDITS.txt" failonerror="true" />
   </target>
+
+  <target name="remove_logs_config_folders">
+    <echo level="Warning" message="Removing subfolders for logs and config if they exist at ${dirs.drop.nuget}${path.separator}chocolatey${path.separator}tools${path.separator}chocolateyInstall" />
+    <delete dir="${dirs.drop.nuget}${path.separator}chocolatey${path.separator}tools${path.separator}chocolateyInstall${path.separator}logs" />
+    <delete dir="${dirs.drop.nuget}${path.separator}chocolatey${path.separator}tools${path.separator}chocolateyInstall${path.separator}config" />
+  </target>
+
 </project>