From d01bd5bd4026de68d649b8ba7e299f3b3d3e2b27 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 3 Feb 2016 11:07:20 +0100 Subject: [PATCH] adjust install/uninstall --- build/NuSpecs/tools/install.core.ps1 | 4 ++-- build/NuSpecs/tools/uninstall.core.ps1 | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build/NuSpecs/tools/install.core.ps1 b/build/NuSpecs/tools/install.core.ps1 index 3ce51b6b34..b3f387c586 100644 --- a/build/NuSpecs/tools/install.core.ps1 +++ b/build/NuSpecs/tools/install.core.ps1 @@ -52,9 +52,9 @@ if ($project) { if(Test-Path $umbracoBinFolder\Umbraco.Web.UI.dll) { Remove-Item $umbracoBinFolder\Umbraco.Web.UI.dll -Force -Confirm:$false } if(Test-Path $umbracoBinFolder\UmbracoExamine.dll) { Remove-Item $umbracoBinFolder\UmbracoExamine.dll -Force -Confirm:$false } - $amd64Folder = Join-Path $projectPath "bin\amd64" + $amd64Folder = Join-Path $umbracoBinFolder "amd64" if(Test-Path $amd64Folder) { Remove-Item $amd64Folder -Force -Recurse -Confirm:$false } - $x86Folder = Join-Path $projectPath "bin\x86" + $x86Folder = Join-Path $umbracoBinFolder "x86" if(Test-Path $x86Folder) { Remove-Item $x86Folder -Force -Recurse -Confirm:$false } } diff --git a/build/NuSpecs/tools/uninstall.core.ps1 b/build/NuSpecs/tools/uninstall.core.ps1 index 8f667e6216..3daa6a1ba7 100644 --- a/build/NuSpecs/tools/uninstall.core.ps1 +++ b/build/NuSpecs/tools/uninstall.core.ps1 @@ -14,8 +14,6 @@ if ($project) { Write-Host "backupPath:" "${backupPath}" $umbracoBinFolder = Join-Path $projectPath "bin" Write-Host "umbracoBinFolder:" "${umbracoBinFolder}" - $appBrowsers = Join-Path $projectPath "App_Browsers" - Write-Host "umbracoBinFolder:" "${appBrowsers}" # Remove backups Write-Host "removing backups:" "${backupPath}" @@ -43,8 +41,8 @@ if ($project) { if(Test-Path $umbracoBinFolder\Umbraco.Web.UI.dll) { Remove-Item $umbracoBinFolder\Umbraco.Web.UI.dll -Force -Confirm:$false } if(Test-Path $umbracoBinFolder\UmbracoExamine.dll) { Remove-Item $umbracoBinFolder\UmbracoExamine.dll -Force -Confirm:$false } - $amd64Folder = Join-Path $projectPath "bin\amd64" + $amd64Folder = Join-Path $umbracoBinFolder "amd64" if(Test-Path $amd64Folder) { Remove-Item $amd64Folder -Force -Recurse -Confirm:$false } - $x86Folder = Join-Path $projectPath "bin\x86" + $x86Folder = Join-Path $umbracoBinFolder "x86" if(Test-Path $x86Folder) { Remove-Item $x86Folder -Force -Recurse -Confirm:$false } } \ No newline at end of file