Fix check for 32-bit installs.

Force a boolean comparison of the $ENV:XXX values, which are actually strings. The boolean rules are very strange in PowerShell. Closes #6. Co-authored-by: lebarsfa <fabrice.le_bars@ensta-bretagne.org>
jmcker · Mar 18, 2023 · 56b8620 · 56b8620
1 parent 4fc8577
commit 56b8620
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/cfssl/tools/chocolateyInstall.ps1 b/cfssl/tools/chocolateyInstall.ps1
@@ -25,7 +25,7 @@ $targets = [Ordered]@{
 if (Test-ProcessAdminRights) {
   $parentFolder = "${ENV:PROGRAMFILES}"
   $pathType = "Machine"
-  if (${ENV:OS_IS64BIT} -And ${ENV:ChocolateyForceX86}) {
+  if (${ENV:OS_IS64BIT} -Eq $true -And -Not (${ENV:ChocolateyForceX86} -Eq $true)) {
     $parentFolder = "${ENV:PROGRAMFILES(x86)}"
   }
 }

diff --git a/gstreamer/tools/chocolateyBeforeModify.ps1 b/gstreamer/tools/chocolateyBeforeModify.ps1
@@ -16,7 +16,7 @@ if (${nameSplit}.Length -gt 1 -and ${nameSplit}[1] -ne "devel") {
 
 # ENV:ChocolateyForceX86 appears to never be set for uninstall
 # No --x86 flag exists on the command
-if (${ENV:OS_IS64BIT} -And -Not ${ENV:ChocolateyForceX86}) {
+if (${ENV:OS_IS64BIT} -Eq $true -And -Not (${ENV:ChocolateyForceX86} -Eq $true)) {
     $pathForUninstall = "%GSTREAMER_1_0_ROOT_$(${toolchain}.ToUpper())_X86_64%\bin"
 } else {
     $pathForUninstall = "%GSTREAMER_1_0_ROOT_$(${toolchain}.ToUpper())_X86%\bin"

diff --git a/gstreamer/tools/chocolateyInstall.ps1 b/gstreamer/tools/chocolateyInstall.ps1
@@ -42,7 +42,7 @@ $packageArgs = @{
 
 Install-ChocolateyPackage @packageArgs
 
-if (${ENV:OS_IS64BIT} -And -Not ${ENV:ChocolateyForceX86}) {
+if (${ENV:OS_IS64BIT} -Eq $true -And -Not (${ENV:ChocolateyForceX86} -Eq $true)) {
   $locationVarName = "GSTREAMER_1_0_ROOT_$(${toolchain}.ToUpper())_X86_64"
 } else {
   $locationVarName = "GSTREAMER_1_0_ROOT_$(${toolchain}.ToUpper())_X86"

diff --git a/libsndfile/tools/chocolateyInstall.ps1 b/libsndfile/tools/chocolateyInstall.ps1
@@ -15,7 +15,7 @@ $url64          = "https://github.com/libsndfile/libsndfile/releases/download/${
 if (Test-ProcessAdminRights) {
   $parentFolder = "${ENV:PROGRAMFILES}"
   $pathType = "Machine"
-  if (${ENV:OS_IS64BIT} -And ${ENV:ChocolateyForceX86}) {
+  if (${ENV:OS_IS64BIT} -Eq $true -And -Not (${ENV:ChocolateyForceX86} -Eq $true)) {
     $parentFolder = "${ENV:PROGRAMFILES(x86)}"
   }
 }