U4-4861 6.2.0 Nuget package copies wrong files

nul800sebastiaan · nul800sebastiaan · commit 3ec6d2b82f47 · 2014-05-19T10:08:26.000+02:00
diff --git a/build/NuSpecs/tools/install.ps1 b/build/NuSpecs/tools/install.ps1
@@ -3,9 +3,11 @@ param($rootPath, $toolsPath, $package, $project)
 if ($project) {	
     $dateTime = Get-Date -Format yyyyMMdd-HHmmss
 	$backupPath = Join-Path (Split-Path $project.FullName -Parent) "\App_Data\NuGetBackup\$dateTime"
+	$copyLogsPath = Join-Path $backupPath "CopyLogs"
 	
-	# Create backup folder if it doesn't exist yet
+	# Create backup folder and logs folder if it doesn't exist yet
 	New-Item -ItemType Directory -Force -Path $backupPath
+	New-Item -ItemType Directory -Force -Path $copyLogsPath
 	
 	# Create a backup of original web.config
 	$projectDestinationPath = Split-Path $project.FullName -Parent
@@ -19,18 +21,26 @@ if ($project) {
 	# Copy umbraco and umbraco_files from package to project folder
 	# This is only done when these folders already exist because we 
 	# only want to do this for upgrades
-	$umbracoFolder = Join-Path $projectDestinationPath "Umbraco\"
+	$umbracoFolder = Join-Path $projectDestinationPath "Umbraco"
 	if(Test-Path $umbracoFolder) {
 		$umbracoFolderSource = Join-Path $rootPath "UmbracoFiles\Umbraco"
-		Copy-Item $umbracoFolder $backupPath -Force
-		robocopy $umbracoFolderSource $umbracoFolder /e /xf UI.xml
+		
+		$umbracoBackupPath = Join-Path $backupPath "Umbraco"
+		New-Item -ItemType Directory -Force -Path $umbracoBackupPath
+		
+		robocopy $umbracoFolder $umbracoBackupPath /e /LOG:$copyLogsPath\UmbracoBackup.log
+		robocopy $umbracoFolderSource $umbracoFolder /is /it /e /xf UI.xml /LOG:$copyLogsPath\UmbracoCopy.log
 	}
 
 	$umbracoClientFolder = Join-Path $projectDestinationPath "Umbraco_Client"	
 	if(Test-Path $umbracoClientFolder) {
 		$umbracoClientFolderSource = Join-Path $rootPath "UmbracoFiles\Umbraco_Client"
-		Copy-Item $umbracoClientFolder $backupPath -Force
-		robocopy $umbracoFolderSource $umbracoClientFolder /e
+		
+		$umbracoClientBackupPath = Join-Path $backupPath "Umbraco_Client"
+		New-Item -ItemType Directory -Force -Path $umbracoClientBackupPath
+		
+		robocopy $umbracoClientFolder $umbracoClientBackupPath /e /LOG:$copyLogsPath\UmbracoClientBackup.log
+		robocopy $umbracoClientFolderSource $umbracoClientFolder /is /it /e /LOG:$copyLogsPath\UmbracoClientCopy.log		
 	}
 	# Open readme.txt file
 	$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')
