Fix #318

Author: Jérémie Bertrand

BuildScripts/AppVeyor-Build.ps1

@@ -95,26 +95,24 @@ function CreatePackage($versionInfos)
 
     Copy-Item $tools\chocolatey\Pretzel\pretzel.nuspec chocoTemp\Pretzel\pretzel.nuspec
     Copy-Item $tools\chocolatey\Pretzel\chocolateyInstall.ps1 chocoTemp\Pretzel\tools\chocolateyInstall.ps1
-    Copy-Item $tools\chocolatey\Pretzel\chocolateyUninstall.ps1 chocoTemp\Pretzel\tools\chocolateyUninstall.ps1
-    Copy-Item $tools\chocolatey\Pretzel\chocolateyBeforeModify.ps1 chocoTemp\Pretzel\tools\chocolateyBeforeModify.ps1
 
     ReplaceChocoInstInfos chocoTemp\Pretzel\tools\chocolateyInstall.ps1 $version $tag $artifacts\Pretzel.$version.zip
 
     nuget pack chocoTemp\Pretzel\pretzel.nuspec -OutputDirectory $artifacts -Version $version -NoPackageAnalysis
 
     # create Pretzel.ScriptCs zip
-    get-childitem $src\Pretzel.ScriptCs\bin\Release -filter *.dll | % { $_.Name } | out-file $artifacts\Pretzel.ScriptCs.Files.txt
-    
     RemoveIfExists Pretzel.ScriptCs.$version.zip
     7z a $artifacts\Pretzel.ScriptCs.$version.zip $src\Pretzel.ScriptCs\bin\Release\*.dll
-    7z a $artifacts\Pretzel.ScriptCs.$version.zip $artifacts\Pretzel.ScriptCs.Files.txt
 
     # build Pretzel.ScriptCs nupkg
+    
     mkdir chocoTemp\Pretzel.ScriptCs\tools
     Copy-Item $tools\chocolatey\Pretzel.ScriptCs\pretzel.scriptcs.nuspec chocoTemp\Pretzel.ScriptCs\pretzel.scriptcs.nuspec
     Copy-Item $tools\chocolatey\Pretzel.ScriptCs\chocolateyInstall.ps1 chocoTemp\Pretzel.ScriptCs\tools\chocolateyInstall.ps1
     Copy-Item $tools\chocolatey\Pretzel.ScriptCs\chocolateyUninstall.ps1 chocoTemp\Pretzel.ScriptCs\tools\chocolateyUninstall.ps1
+
     ReplaceChocoInstInfos chocoTemp\Pretzel.ScriptCs\tools\chocolateyInstall.ps1 $version $tag $artifacts\Pretzel.ScriptCs.$version.zip
+    ReplaceChocoInstInfos chocoTemp\Pretzel.ScriptCs\tools\chocolateyUninstall.ps1 $version $tag $artifacts\Pretzel.ScriptCs.$version.zip
 
     nuget pack chocoTemp\Pretzel.ScriptCs\pretzel.scriptcs.nuspec -OutputDirectory $artifacts -Version $version -NoPackageAnalysis
 

BuildScripts/build.proj

@@ -76,8 +76,6 @@
     <FileUpdate Files="$(ChocolateyInstall)"
                 Regex="{{version}}"
                 ReplacementText="$(Version)"/>
-    <Copy SourceFiles="$(MSBuildProjectDirectory)\..\tools\chocolatey\Pretzel\chocolateyUninstall.ps1"
-      DestinationFiles="$(MSBuildProjectDirectory)\..\build\chocolatey\tools\chocolateyUninstall.ps1" />
 
     <Exec Command='"@(NuGet)" pack "$(MSBuildProjectDirectory)\..\build\chocolatey\pretzel.nuspec" -OutputDirectory "$(MSBuildProjectDirectory)\..\artifacts" -Version $(Version) -NoPackageAnalysis' />
     <Message Text="=========== Package Done ===========" Importance="High" />

tools/chocolatey/Pretzel.ScriptCs/chocolateyInstall.ps1

@@ -1,7 +1,7 @@
 $packageName = 'Pretzel.ScriptCs'
 $url = 'https://github.com/Code52/Pretzel/releases/download/{{tag}}/Pretzel.ScriptCs.{{version}}.zip'
 
-$binRoot = Get-BinRoot
-$pretzelPath = "$binRoot\Pretzel"
+# It is a plugin to Pretzel and as such need to be installed in the same directory
+$installDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)\..\..\pretzel\tools"
 
-Install-ChocolateyZipPackage "$packageName" "$url" $pretzelPath -checksum {{checksum}} -checksumType sha256
+Install-ChocolateyZipPackage $packageName $url $installDir -checksum {{checksum}} -checksumType sha256

tools/chocolatey/Pretzel.ScriptCs/chocolateyUninstall.ps1

@@ -1,10 +1,9 @@
 Write-Debug "Uninstall Pretzel.ScriptCs"
 
-$binRoot = Get-BinRoot
-$pretzelPath = "$binRoot\Pretzel"
+$installDir = $(Split-Path -parent $MyInvocation.MyCommand.Definition)
+$pretzelPath = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)\..\..\pretzel\tools"
 
 # Remove folder
 If (Test-Path $pretzelPath){
-    gc $pretzelPath\Pretzel.ScriptCs.Files.txt | foreach ($_) { If (($_) -And (Test-Path $pretzelPath\$_)) { Remove-Item $pretzelPath\$_ } }
-    Remove-Item $pretzelPath\Pretzel.ScriptCs.Files.txt
+    gc $installDir\..\Pretzel.ScriptCs.{{version}}.zip.txt | foreach ($_) { If (($_) -And (Test-Path $_)) { Remove-Item $_ } }
 }

tools/chocolatey/Pretzel/chocolateyBeforeModify.ps1

@@ -1,8 +1,5 @@
 $packageName = 'Pretzel'
 $url = 'https://github.com/Code52/Pretzel/releases/download/{{tag}}/Pretzel.{{version}}.zip'
+$installDir = $(Split-Path -parent $MyInvocation.MyCommand.Definition)
 
-$binRoot = Get-BinRoot
-$pretzelPath = "$binRoot\$packageName"
-
-Install-ChocolateyZipPackage "$packageName" "$url" $pretzelPath -checksum {{checksum}} -checksumType sha256
-Install-ChocolateyPath $pretzelPath
+Install-ChocolateyZipPackage $packageName $url $installDir -checksum {{checksum}} -checksumType sha256