Skip to content

Commit

Permalink
Merge pull request #17 from rsWinAutomationSupport/staging
Browse files Browse the repository at this point in the history
Merging changes from staging

Not an awful lot we can do here to assure that this "fix" is still necessary. Testing in 3 freshly build environments has not yielded any errors so I think we can safely assume that the `PowerShellAccessControl` module is not causing any problems anymore.
  • Loading branch information
nick-o committed Nov 11, 2015
2 parents 4003f77 + 0be8572 commit 3fce641
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions DSCResources/RS_rsModuleZipSum/RS_rsModuleZipSum.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@ Function Set-TargetResource {
$moduleName = $($module, '_', $(((Get-Content -Path $((Join-Path $modulePath -ChildPath $module), $($module, ".psd1" -join '') -join '\')) -match "ModuleVersion") -replace 'ModuleVersion', '' -replace ' ', '' -replace '=', '' -replace "'", '' -replace '"', '').Trim() -join '')
if(!(Test-Path -Path $(Join-Path $destination -ChildPath $($moduleName, '.zip' -join ''))) -or !($((Get-FileHash -Path $(Join-Path $destination -ChildPath $($moduleName, '.zip' -join '')) -ErrorAction SilentlyContinue).Hash) -eq $(Get-Content -Path $(Join-Path $destination -ChildPath $($moduleName, '.zip.checksum' -join '')) -ErrorAction SilentlyContinue))) {
Remove-Item -Path $((Join-Path $destination -ChildPath $module), '*' -join '') -Force
if($module -ne "PowerShellAccessControl") {
New-ResourceZip -modulePath $(Join-Path $modulePath -ChildPath $module) -outputDir $destination
}
New-ResourceZip -modulePath $(Join-Path $modulePath -ChildPath $module) -outputDir $destination
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion rsPackageSourceManager.psd1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@{
# Version number of this module.
ModuleVersion = '1.0.3'
ModuleVersion = '1.0.4'

# ID used to uniquely identify this module
GUID = '28a61e12-3cec-4deb-938e-d20740b586dc'
Expand Down

0 comments on commit 3fce641

Please sign in to comment.