Merge pull request #2152 from pauby/fix/apache-httpd-priv-vars

(apache-httpd)(#2151) Replace private variables
chocolatey-community · Feb 22, 2023 · 92a9b85 · 92a9b85
2 parents 4c02716 + 905c368
commit 92a9b85
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/automatic/apache-httpd/apache-httpd.nuspec b/automatic/apache-httpd/apache-httpd.nuspec
@@ -41,7 +41,8 @@ Example: `choco install apache-httpd --params '"/installLocation:C:\HTTPD /port:
 ]]></description>
     <tags>apache httpd webserver admin</tags>
     <dependencies>
-       <dependency id="vcredist140" version="14.32.31332" />
+      <dependency id="chocolatey" version="1.2.0" />
+      <dependency id="vcredist140" version="14.32.31332" />
    </dependencies>
   </metadata>
   <files>

diff --git a/automatic/apache-httpd/tools/helpers.ps1 b/automatic/apache-httpd/tools/helpers.ps1
@@ -50,7 +50,7 @@ function Assert-TcpPortIsOpen {
 }
 
 function Get-ApacheInstallOptions {
-    $configFile = Join-Path $env:chocolateyPackageFolder 'config.xml'
+    $configFile = Join-Path -Path (Get-ChocolateyPath -PathType 'PackagePath') -ChildPath 'config.xml'
     $config = Import-CliXml $configFile
 
     return $config
@@ -132,7 +132,7 @@ function Set-ApacheInstallOptions {
         ServiceName = $arguments.serviceName
     }
 
-    $configFile = Join-Path $env:chocolateyPackageFolder 'config.xml'
+    $configFile = Join-Path -Path (Get-ChocolateyPath -PathType 'PackagePath') -ChildPath 'config.xml'
     Export-Clixml -Path $configFile -InputObject $config
 }