Merge branch 'hotfix/3.0.1'

gep13 · gep13 · commit ea42cee76919 · 2023-06-06T14:37:10.000+01:00
* hotfix/3.0.1: GH-518: fix Call-Chocolatey usage (GH-532) Use 'choco install' instead of cinst (#533) (#524) Fix Build Handling of Long Prerelease (maint) eol consistency (maint) .gitattributes new line (GH-501) Fix Propagation of VerbosePreference (#512) (#508) Fix package iconUrl Fixed typo in README.md Update README.md (maint) Re-instate the Boxstarter logo (maint) link boxstarter.org repository (maint) crlf in Markdown files!
diff --git a/.gitattributes b/.gitattributes
@@ -2,4 +2,5 @@
 * text=auto
 
 # Declare files that will always have CRLF line endings on checkout.
-*.md text eol=crlf
+*.md text eol=crlf
+
diff --git a/Boxstarter.Chocolatey/Chocolatey.ps1 b/Boxstarter.Chocolatey/Chocolatey.ps1
@@ -622,7 +622,7 @@ function Export-BoxstarterVars {
 
 function Export-ToEnvironment($varToExport, $scope) {
     $val = Invoke-Expression "`$$($scope):$varToExport"
-    if ($val -is [string] -or $val -is [boolean]) {
+    if ($val -is [string] -or $val -is [boolean] -or $val -is [system.management.automation.actionpreference]) {
         Set-Item -Path "Env:\BEX.$varToExport" -Value $val.ToString() -Force
     }
     elseif ($null -eq $val) {
diff --git a/Boxstarter.Chocolatey/New-PackageFromScript.ps1 b/Boxstarter.Chocolatey/New-PackageFromScript.ps1
@@ -55,7 +55,7 @@ about_boxstarter_chocolatey
     $chocoInstall = [System.Environment]::GetEnvironmentVariable('ChocolateyInstall', 'MACHINE')
     if($chocoInstall -eq $null) {
         # Simply Installs choco repo and helpers
-        Call-Chocolatey
+        Call-Chocolatey -Command 'install' -PackageNames @('chocolatey')
         $chocoInstall = [System.Environment]::GetEnvironmentVariable('ChocolateyInstall', 'MACHINE')
     }
     if($source -like "*://*"){
diff --git a/Boxstarter.Chocolatey/invoke-chocolatey.ps1 b/Boxstarter.Chocolatey/invoke-chocolatey.ps1
@@ -80,7 +80,7 @@ function Invoke-Chocolatey($chocoArgs) {
                 UseNewEnvironment = $false
                 Wait              = $false
                 WorkingDirectory  = $targetWdir
-                Verbose           = $VerbosePreference
+                Verbose           = ($global:VerbosePreference -eq "Continue")
             }
             
             $p = Start-Process @pargs
diff --git a/BuildScripts/bootstrapper.ps1 b/BuildScripts/bootstrapper.ps1
@@ -45,11 +45,11 @@ function Get-Boxstarter {
         $chocoVersion  = "2.9.17"
         try {
             New-Object -TypeName Version -ArgumentList $chocoVersion.split('-')[0] | Out-Null
-            $command = "cinst Boxstarter -y"
+            $command = "choco install Boxstarter -y"
         }
         catch{
             # if there is no -v then its an older version with no -y
-            $command = "cinst Boxstarter"
+            $command = "choco install Boxstarter"
         }
         $command += " --version $version"
         Invoke-Expression $command
diff --git a/BuildScripts/default.ps1 b/BuildScripts/default.ps1
@@ -58,13 +58,23 @@ task Run-GitVersion {
 
     $versionInfo = $joined | ConvertFrom-Json
 
-    $prerelease = $versionInfo.PreReleaseLabel
     $sha = $versionInfo.Sha.Substring(0,8)
     $majorMinorPatch = $versionInfo.MajorMinorPatch
     $buildDate = Get-Date -Format "yyyyMMdd"
     $script:changeset = $versionInfo.Sha
     $script:version = $versionInfo.AssemblySemVer
 
+    # Having a pre-release label of greater than 10 characters can cause problems when trying to run choco pack.
+    # Since we typically only see this when building a local feature branch, or a PR, let's just trim it down to
+    # the 10 character limit, and move on.
+    $prerelease = $versionInfo.PreReleaseLabel.Replace("-","").Substring(0,10)
+
+    # Chocolatey doesn't support a prerelease that starts with a digit.
+    # If we see a digit here, merely replace it with an `a` to get around this.
+    if ($prerelease -match "^\d") {
+        $prerelease = "a$($prerelease.Substring(1,9))"
+    }
+
     if ($isTagged) {
         $script:packageVersion = $versionInfo.LegacySemVer
         $script:informationalVersion = $versionInfo.InformationalVersion
diff --git a/BuildScripts/nuget/Boxstarter.Azure.nuspec b/BuildScripts/nuget/Boxstarter.Azure.nuspec
@@ -7,7 +7,7 @@
     <owners>Matt Wrock, Rob Reynolds, Gary Ewan Park</owners>
     <copyright>2018 Chocolatey Software, Inc, 2012 - 2018 Matt Wrock</copyright>
     <title>Boxstarter Azure Module</title>
-    <iconUrl>https://cdn.rawgit.com/chocolatey/boxstarter/master/Web/Images/boxLogo_sm.png</iconUrl>
+    <iconUrl>https://img.chocolatey.org/logos/boxstarter-logo.png</iconUrl>
     <projectUrl>https://Boxstarter.org</projectUrl>
     <licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
     <summary>Azure support for Boxstarter</summary>
diff --git a/BuildScripts/nuget/Boxstarter.Bootstrapper.nuspec b/BuildScripts/nuget/Boxstarter.Bootstrapper.nuspec
@@ -7,7 +7,7 @@
     <owners>Matt Wrock, Rob Reynolds, Gary Ewan Park</owners>
     <copyright>2018 Chocolatey Software, Inc, 2012 - 2018 Matt Wrock</copyright>
     <title>Boxstarter Bootstrapper Module</title>
-    <iconUrl>https://cdn.rawgit.com/chocolatey/boxstarter/master/Web/Images/boxLogo_sm.png</iconUrl>
+    <iconUrl>https://img.chocolatey.org/logos/boxstarter-logo.png</iconUrl>
     <projectUrl>https://Boxstarter.org</projectUrl>
     <licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
     <summary>Bootstrapper module for Boxstarter</summary>
diff --git a/BuildScripts/nuget/Boxstarter.Chocolatey.nuspec b/BuildScripts/nuget/Boxstarter.Chocolatey.nuspec
@@ -6,7 +6,7 @@
     <authors>Chocolatey Software, Inc</authors>
     <owners>Matt Wrock, Rob Reynolds, Gary Ewan Park</owners>
     <copyright>2018 Chocolatey Software, Inc, 2012 - 2018 Matt Wrock</copyright>
-    <iconUrl>https://cdn.rawgit.com/chocolatey/boxstarter/master/Web/Images/boxLogo_sm.png</iconUrl>
+    <iconUrl>https://img.chocolatey.org/logos/boxstarter-logo.png</iconUrl>
     <title>Boxstarter Chocolatey Module</title>
     <projectUrl>https://Boxstarter.org</projectUrl>
     <licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
diff --git a/BuildScripts/nuget/Boxstarter.HyperV.nuspec b/BuildScripts/nuget/Boxstarter.HyperV.nuspec
@@ -7,7 +7,7 @@
     <owners>Matt Wrock, Rob Reynolds, Gary Ewan Park</owners>
     <copyright>2018 Chocolatey Software, Inc, 2012 - 2018 Matt Wrock</copyright>
     <title>Boxstarter HyperV Module</title>
-    <iconUrl>https://cdn.rawgit.com/chocolatey/boxstarter/master/Web/Images/boxLogo_sm.png</iconUrl>
+    <iconUrl>https://img.chocolatey.org/logos/boxstarter-logo.png</iconUrl>
     <projectUrl>https://Boxstarter.org</projectUrl>
     <licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
     <summary>Hyper-V support for Boxstarter</summary>
diff --git a/BuildScripts/nuget/Boxstarter.TestRunner.nuspec b/BuildScripts/nuget/Boxstarter.TestRunner.nuspec
@@ -7,7 +7,7 @@
     <owners>Matt Wrock, Rob Reynolds, Gary Ewan Park</owners>
     <copyright>2018 Chocolatey Software, Inc, 2012 - 2018 Matt Wrock</copyright>
     <title>Boxstarter Test Runner Module</title>
-    <iconUrl>https://cdn.rawgit.com/chocolatey/boxstarter/master/Web/Images/boxLogo_sm.png</iconUrl>
+    <iconUrl>https://img.chocolatey.org/logos/boxstarter-logo.png</iconUrl>
     <projectUrl>https://Boxstarter.org</projectUrl>
     <licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
     <summary>Test runner module for Boxstarter</summary>
diff --git a/BuildScripts/nuget/Boxstarter.WinConfig.nuspec b/BuildScripts/nuget/Boxstarter.WinConfig.nuspec
@@ -9,7 +9,7 @@
     <licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
     <id>Boxstarter.WinConfig</id>
     <title>Boxstarter WinConfig Module</title>
-    <iconUrl>https://cdn.rawgit.com/chocolatey/boxstarter/master/Web/Images/boxLogo_sm.png</iconUrl>
+    <iconUrl>https://img.chocolatey.org/logos/boxstarter-logo.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>Windows environment module for Boxstarter</summary>
     <packageSourceUrl>https://github.com/chocolatey/boxstarter/</packageSourceUrl>
diff --git a/BuildScripts/nuget/Boxstarter.nuspec b/BuildScripts/nuget/Boxstarter.nuspec
@@ -6,7 +6,7 @@
     <authors>Chocolatey Software, Inc</authors>
     <owners>Matt Wrock, Rob Reynolds, Gary Ewan Park</owners>
     <copyright>2018 Chocolatey Software, Inc, 2012 - 2018 Matt Wrock</copyright>
-    <iconUrl>https://cdn.rawgit.com/chocolatey/boxstarter/master/Web/Images/boxLogo_sm.png</iconUrl>
+    <iconUrl>https://img.chocolatey.org/logos/boxstarter-logo.png</iconUrl>
     <title>Boxstarter</title>
     <projectUrl>https://Boxstarter.org</projectUrl>
     <licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
diff --git a/README.md b/README.md
@@ -62,12 +62,12 @@ Enable-PSRemoting -Force
 * [Mailing List](https://groups.google.com/forum/#!forum/boxstarter)
 * [Twitter](https://twitter.com/chocolateynuget) / [Facebook](https://www.facebook.com/ChocolateySoftware) / [GitHub](https://github.com/chocolatey)
 * [Blog](https://chocolatey.org/blog) / [Newsletter](https://us8.list-manage.com/subscribe?u=86a6d80146a0da7f2223712e4&id=73b018498d)
-* [Documentation](https://boxstarter.org/WhyBoxstarter)
+* [Documentation](https://boxstarter.org/whyboxstarter)
 * [Community Chat](https://ch0.co/community)
 
 ### Documentation
 
-Please see the [Boxstarter docs](https://boxstarter.org/WhyBoxstarter).
+Please see the [Boxstarter docs](https://boxstarter.org/whyboxstarter).
 
 ### Requirements
 
diff --git a/tests/Chocolatey/Chocolatey.tests.ps1 b/tests/Chocolatey/Chocolatey.tests.ps1
@@ -412,6 +412,23 @@ Describe "Call-Chocolatey" {
         }
     }
 
+    context "when not verbose" {
+        $script:passedArgs = ""
+        Mock Invoke-LocalChocolatey { $script:passedArgs = $chocoArgs }
+        $global:VerbosePreference="SilentlyContinue"
+        choco Install pkg
+        $global:VerbosePreference | Should Be "SilentlyContinue"
+
+        it "passes expected params" {
+            $passedArgs.count | Should Be 5
+            $passedArgs[0] | Should Be "Install"
+            $passedArgs[1] | Should Be "pkg"
+            $passedArgs[2] | Should Be "-Source"
+            # $passedArgs[3] -> feeds, may differ from system to system
+            $passedArgs[4] | Should Be "-y"
+        }
+    }
+
     context "when verbose" {
         $script:passedArgs = ""
         Mock Invoke-LocalChocolatey { $script:passedArgs = $chocoArgs }

Original file line number	Diff line number	Diff line change
`@@ -622,7 +622,7 @@ function Export-BoxstarterVars {`
`622`	`622`
`623`	`623`	`function Export-ToEnvironment($varToExport, $scope) {`
`624`	`624`	$val = Invoke-Expression "`$$($scope):$varToExport"
`625`		`- if ($val -is [string] -or $val -is [boolean]) {`
	`625`	`+ if ($val -is [string] -or $val -is [boolean] -or $val -is [system.management.automation.actionpreference]) {`
`626`	`626`	`Set-Item -Path "Env:\BEX.$varToExport" -Value $val.ToString() -Force`
`627`	`627`	`}`
`628`	`628`	`elseif ($null -eq $val) {`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ about_boxstarter_chocolatey`
`55`	`55`	`$chocoInstall = [System.Environment]::GetEnvironmentVariable('ChocolateyInstall', 'MACHINE')`
`56`	`56`	`if($chocoInstall -eq $null) {`
`57`	`57`	`# Simply Installs choco repo and helpers`
`58`		`- Call-Chocolatey`
	`58`	`+ Call-Chocolatey -Command 'install' -PackageNames @('chocolatey')`
`59`	`59`	`$chocoInstall = [System.Environment]::GetEnvironmentVariable('ChocolateyInstall', 'MACHINE')`
`60`	`60`	`}`
`61`	`61`	`if($source -like "://"){`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ function Invoke-Chocolatey($chocoArgs) {`
`80`	`80`	`UseNewEnvironment = $false`
`81`	`81`	`Wait = $false`
`82`	`82`	`WorkingDirectory = $targetWdir`
`83`		`- Verbose = $VerbosePreference`
	`83`	`+ Verbose = ($global:VerbosePreference -eq "Continue")`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`$p = Start-Process @pargs`
Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,11 @@ function Get-Boxstarter {`
`45`	`45`	`$chocoVersion = "2.9.17"`
`46`	`46`	`try {`
`47`	`47`	`New-Object -TypeName Version -ArgumentList $chocoVersion.split('-')[0] \| Out-Null`
`48`		`- $command = "cinst Boxstarter -y"`
	`48`	`+ $command = "choco install Boxstarter -y"`
`49`	`49`	`}`
`50`	`50`	`catch{`
`51`	`51`	`# if there is no -v then its an older version with no -y`
`52`		`- $command = "cinst Boxstarter"`
	`52`	`+ $command = "choco install Boxstarter"`
`53`	`53`	`}`
`54`	`54`	`$command += " --version $version"`
`55`	`55`	`Invoke-Expression $command`