Merge branch 'release/1.0.9'

dfch · Oct 29, 2015 · 394763a · 394763a
2 parents 25d5431 + f97491f
commit 394763a
Show file tree

Hide file tree

Showing 42 changed files with 451 additions and 446 deletions.
diff --git a/Assert-CmdletDocumentation.ps1 → src/Assert-CmdletDocumentation.ps1 b/Assert-CmdletDocumentation.ps1 → src/Assert-CmdletDocumentation.ps1
diff --git a/ConvertFrom-Base64.Tests.ps1 → src/ConvertFrom-Base64.Tests.ps1 b/ConvertFrom-Base64.Tests.ps1 → src/ConvertFrom-Base64.Tests.ps1
diff --git a/ConvertFrom-Base64.ps1 → src/ConvertFrom-Base64.ps1 b/ConvertFrom-Base64.ps1 → src/ConvertFrom-Base64.ps1
diff --git a/ConvertFrom-CmdletHelp.ps1 → src/ConvertFrom-CmdletHelp.ps1 b/ConvertFrom-CmdletHelp.ps1 → src/ConvertFrom-CmdletHelp.ps1
diff --git a/ConvertFrom-Hashtable.ps1 → src/ConvertFrom-Hashtable.ps1 b/ConvertFrom-Hashtable.ps1 → src/ConvertFrom-Hashtable.ps1
diff --git a/ConvertFrom-PSCustomObject.ps1 → src/ConvertFrom-PSCustomObject.ps1 b/ConvertFrom-PSCustomObject.ps1 → src/ConvertFrom-PSCustomObject.ps1
diff --git a/ConvertFrom-SecureStringDF.ps1 → src/ConvertFrom-SecureStringDF.ps1 b/ConvertFrom-SecureStringDF.ps1 → src/ConvertFrom-SecureStringDF.ps1
diff --git a/ConvertFrom-UnicodeHexEncoding.ps1 → src/ConvertFrom-UnicodeHexEncoding.ps1 b/ConvertFrom-UnicodeHexEncoding.ps1 → src/ConvertFrom-UnicodeHexEncoding.ps1
diff --git a/ConvertFrom-UrlEncoded.ps1 → src/ConvertFrom-UrlEncoded.ps1 b/ConvertFrom-UrlEncoded.ps1 → src/ConvertFrom-UrlEncoded.ps1
diff --git a/ConvertTo-Base64.Tests.ps1 → src/ConvertTo-Base64.Tests.ps1 b/ConvertTo-Base64.Tests.ps1 → src/ConvertTo-Base64.Tests.ps1
diff --git a/ConvertTo-Base64.ps1 → src/ConvertTo-Base64.ps1 b/ConvertTo-Base64.ps1 → src/ConvertTo-Base64.ps1
diff --git a/ConvertTo-UrlEncoded.Tests.ps1 → src/ConvertTo-UrlEncoded.Tests.ps1 b/ConvertTo-UrlEncoded.Tests.ps1 → src/ConvertTo-UrlEncoded.Tests.ps1
diff --git a/ConvertTo-UrlEncoded.ps1 → src/ConvertTo-UrlEncoded.ps1 b/ConvertTo-UrlEncoded.ps1 → src/ConvertTo-UrlEncoded.ps1
diff --git a/Expand-CompressedItem.ps1 → src/Expand-CompressedItem.ps1 b/Expand-CompressedItem.ps1 → src/Expand-CompressedItem.ps1
diff --git a/Export-Credential.ps1 → src/Export-Credential.ps1 b/Export-Credential.ps1 → src/Export-Credential.ps1
diff --git a/Format-IpAddress.ps1 → src/Format-IpAddress.ps1 b/Format-IpAddress.ps1 → src/Format-IpAddress.ps1
diff --git a/Format-Xml.ps1 → src/Format-Xml.ps1 b/Format-Xml.ps1 → src/Format-Xml.ps1
diff --git a/Get-ComObjectType.ps1 → src/Get-ComObjectType.ps1 b/Get-ComObjectType.ps1 → src/Get-ComObjectType.ps1
diff --git a/Get-Constructor.ps1 → src/Get-Constructor.ps1 b/Get-Constructor.ps1 → src/Get-Constructor.ps1
diff --git a/Get-Priority.Tests.ps1 → src/Get-Priority.Tests.ps1 b/Get-Priority.Tests.ps1 → src/Get-Priority.Tests.ps1
diff --git a/Get-Priority.ps1 → src/Get-Priority.ps1 b/Get-Priority.ps1 → src/Get-Priority.ps1
diff --git a/Import-Credential.ps1 → src/Import-Credential.ps1 b/Import-Credential.ps1 → src/Import-Credential.ps1
diff --git a/Import-Module.ps1 → src/Import-Module.ps1 b/Import-Module.ps1 → src/Import-Module.ps1
diff --git a/Merge-Hashtable.Tests.ps1 → src/Merge-Hashtable.Tests.ps1 b/Merge-Hashtable.Tests.ps1 → src/Merge-Hashtable.Tests.ps1
diff --git a/Merge-Hashtable.ps1 → src/Merge-Hashtable.ps1 b/Merge-Hashtable.ps1 → src/Merge-Hashtable.ps1
diff --git a/New-ActivityProgress.ps1 → src/New-ActivityProgress.ps1 b/New-ActivityProgress.ps1 → src/New-ActivityProgress.ps1
diff --git a/New-CustomErrorRecord.ps1 → src/New-CustomErrorRecord.ps1 b/New-CustomErrorRecord.ps1 → src/New-CustomErrorRecord.ps1
diff --git a/New-SecurePassword.ps1 → src/New-SecurePassword.ps1 b/New-SecurePassword.ps1 → src/New-SecurePassword.ps1
diff --git a/Remove-ActivityProgress.ps1 → src/Remove-ActivityProgress.ps1 b/Remove-ActivityProgress.ps1 → src/Remove-ActivityProgress.ps1
diff --git a/Send-ShortMessage.Tests.ps1 → src/Send-ShortMessage.Tests.ps1 b/Send-ShortMessage.Tests.ps1 → src/Send-ShortMessage.Tests.ps1
diff --git a/Send-ShortMessage.ps1 → src/Send-ShortMessage.ps1 b/Send-ShortMessage.ps1 → src/Send-ShortMessage.ps1
diff --git a/Set-ActivityProgress.ps1 → src/Set-ActivityProgress.ps1 b/Set-ActivityProgress.ps1 → src/Set-ActivityProgress.ps1
diff --git a/Set-SslSecurityPolicy.ps1 → src/Set-SslSecurityPolicy.ps1 b/Set-SslSecurityPolicy.ps1 → src/Set-SslSecurityPolicy.ps1
diff --git a/Test-CmdletDocumentation.ps1 → src/Test-CmdletDocumentation.ps1 b/Test-CmdletDocumentation.ps1 → src/Test-CmdletDocumentation.ps1
diff --git a/Test-StringPattern.ps1 → src/Test-StringPattern.ps1 b/Test-StringPattern.ps1 → src/Test-StringPattern.ps1
diff --git a/Update-Signature.Tests.ps1 → src/Update-Signature.Tests.ps1 b/Update-Signature.Tests.ps1 → src/Update-Signature.Tests.ps1
diff --git a/Update-Signature.ps1 → src/Update-Signature.ps1 b/Update-Signature.ps1 → src/Update-Signature.ps1
@@ -66,6 +66,11 @@ PARAM
 	# File extensions of the script files to sign
 	[Parameter(Mandatory = $false)]
 	$IncludeExtensions = @('*.ps1','*.psm1','*.psd1','*.dll','*.exe')
+	,
+	# Specifies whether to force an update of the signature 
+	# even if the existing signature is still valid.
+	[Parameter(Mandatory = $false)]
+	[switch] $Force = $false
 )
 
 if($PSCmdlet.ParameterSetName -eq 'path')
@@ -83,13 +88,17 @@ foreach($Object in $InputObject)
 	{
 		continue;
 	}
-	if($CounterSign)
-	{
-		Set-AuthenticodeSignature $Object -Certificate $cert -TimestampServer $TimestampServer -Confirm:$false;
-	}
-	else
+	$IsValid = (Get-AuthenticodeSignature $Object | Select Status).Status -eq 'Valid';
+	if(!$IsValid -Or $Force)
 	{
-		Set-AuthenticodeSignature $Object -Certificate $cert -Confirm:$false;
+		if($CounterSign)
+		{
+			Set-AuthenticodeSignature $Object -Certificate $cert -TimestampServer $TimestampServer -Confirm:$false;
+		}
+		else
+		{
+			Set-AuthenticodeSignature $Object -Certificate $cert -Confirm:$false;
+		}
 	}
 }
 
@@ -116,8 +125,8 @@ if($MyInvocation.ScriptName) { Export-ModuleMember -Function Update-Signature; }
 # SIG # Begin signature block
 # MIIXDwYJKoZIhvcNAQcCoIIXADCCFvwCAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB
 # gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR
-# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUnReLkphf8jjgJwDQHjD5iOOK
-# Q7mgghHCMIIEFDCCAvygAwIBAgILBAAAAAABL07hUtcwDQYJKoZIhvcNAQEFBQAw
+# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQU7c4D/BlD5jB+qCNtbycM6qSU
+# F+agghHCMIIEFDCCAvygAwIBAgILBAAAAAABL07hUtcwDQYJKoZIhvcNAQEFBQAw
 # VzELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNV
 # BAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw0xMTA0
 # MTMxMDAwMDBaFw0yODAxMjgxMjAwMDBaMFIxCzAJBgNVBAYTAkJFMRkwFwYDVQQK
@@ -216,26 +225,26 @@ if($MyInvocation.ScriptName) { Export-ModuleMember -Function Update-Signature; }
 # MDAuBgNVBAMTJ0dsb2JhbFNpZ24gQ29kZVNpZ25pbmcgQ0EgLSBTSEEyNTYgLSBH
 # MgISESENFrJbjBGW0/5XyYYR5rrZMAkGBSsOAwIaBQCgeDAYBgorBgEEAYI3AgEM
 # MQowCKACgAChAoAAMBkGCSqGSIb3DQEJAzEMBgorBgEEAYI3AgEEMBwGCisGAQQB
-# gjcCAQsxDjAMBgorBgEEAYI3AgEVMCMGCSqGSIb3DQEJBDEWBBRlvIbCKh6iB/yV
-# 598qjEpwUQGhJDANBgkqhkiG9w0BAQEFAASCAQB7bU76OrueIaC2y47BhbVopmlx
-# 2XuGKmRcac5viI3EkLpCQ2tKPpblsFOeT28PSwpcjhKaxJuHPLBxOqz9kT0q8WS+
-# nOa00LtH6+IvhpsDNUoXdZUvOvx2cCj02g2T8a00ozX0d9D7M9Fam3SSwEZ0ig80
-# bra1OxLaMXxAk/InRHpj6/SkN5o9ueWFKhAEH1cGcJn6bskzfL5osjJxRkBjhZ3m
-# subyP83tdK3swn+2TiJWdgdFWaBu82ZxcRiIsi8CDtdnx1X987yHK/GWhpEnkoeO
-# W3FFnHN4ZTMRN8+5n03e7EAYme3IOn2p73SXQclGQOWDnDMWMyanjuPeQT3HoYIC
+# gjcCAQsxDjAMBgorBgEEAYI3AgEVMCMGCSqGSIb3DQEJBDEWBBT9NxDLySVRdPrt
+# CiBi/NEw0lIfRzANBgkqhkiG9w0BAQEFAASCAQBIooSPJVqyiriK60xRzW3FwHFo
+# XR8dVnmErKVLR5/7AfyqXeOsgveXAPGLukprvDxPcsGAxfRNUJT+G9YPo0jTAMpL
+# 3nnMkhKUNOSYaj7LPAnL2hCY3LcRfY+GToS9TCvwhaWVkgb1+/Z717+ePbP3BR0I
+# xW5VDSLlB+OzVjt+PLn6mvg7e2YcEJO6nqzljATT1RX85p2Xju5GjmghdEBHZ0Gx
+# U4P3K76d/kFBgGAz5acHXrSoRlveG9bx8ieuF7fqhF02lhT3FR7PAMYcgl2pnAzC
+# T2lXQpAP8/DfN2eOXhkL8ocAXiwbGOhP+QYQav+sxtrCh3G5sAflvUto3lpkoYIC
 # ojCCAp4GCSqGSIb3DQEJBjGCAo8wggKLAgEBMGgwUjELMAkGA1UEBhMCQkUxGTAX
 # BgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExKDAmBgNVBAMTH0dsb2JhbFNpZ24gVGlt
 # ZXN0YW1waW5nIENBIC0gRzICEhEhBqCB0z/YeuWCTMFrUglOAzAJBgUrDgMCGgUA
 # oIH9MBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTE1
-# MTAxODExMDMyMlowIwYJKoZIhvcNAQkEMRYEFHg8FRoAMa6FGyy3le36Je+KbQPP
+# MTAyOTA0NTgwNFowIwYJKoZIhvcNAQkEMRYEFOjcHZgXjSBz7fIWF1kgQbcbqm/8
 # MIGdBgsqhkiG9w0BCRACDDGBjTCBijCBhzCBhAQUs2MItNTN7U/PvWa5Vfrjv7Es
 # KeYwbDBWpFQwUjELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYt
 # c2ExKDAmBgNVBAMTH0dsb2JhbFNpZ24gVGltZXN0YW1waW5nIENBIC0gRzICEhEh
-# BqCB0z/YeuWCTMFrUglOAzANBgkqhkiG9w0BAQEFAASCAQBxp6TWwhrRpAmAWtnz
-# slFbDClmf8EokpZ8wXK/vUGinyT4DYJnWZZvFfqF+r5T/UyKP/ntPBiK4Oyy4fDT
-# HLzmTj0pvcDBK9tXRjMiIdHf9YyG/7OA+N2j8gRc5GSKwE1dFa0Tx50CFvof0lrz
-# hf3XGFLQrLwmJlFLpzLhhwoIdaVqeo7qDOkcw2s+sl2rgiPFgzQE85fqoeehZcSv
-# DUqe9/zSvTDYq+rJHo/VjR8f4iZ6dB6fdJZs/GjeFWK5g1wTnbABTfdWDqOQr/bn
-# lpFWRhYj/DrRyEHmRgu7VXKPmRoxU0zlet5FvphfEaoZVBmhIp7rYktUy1B9q652
-# 16Nt
+# BqCB0z/YeuWCTMFrUglOAzANBgkqhkiG9w0BAQEFAASCAQBRBfY8ej83KiBByUFp
+# fgbvHTdWRMxFNiNv4kREWoo/56TxaHEDLhe73PRDDKJzFykaidqK4hVDGnGPjDXb
+# 2l9lOtreYhZgA0iw1OZ8Ny/L0bUns5vw8vtUr0hyhSD14elGvpGLicxkJ5PUbHhs
+# 87t+hh4j1zASLWU4d9BOStTfw6CK31+WiH93NrT0+GgaYVfVMxR+9lV3KGLts6IT
+# WTKXiIXcyYRuMFO+Aq7uGbBGCT/kTSfCUI7UCgoh202cu8Sx0A8cfFO5xI2u81A4
+# jIKNn/0owGukwB7weFqj/vM+y1QZMhIK6GyuyDTpzKTysQ/JJYHRMQZMwmPd+S1Q
+# Sktb
 # SIG # End signature block
diff --git a/biz.dfch.PS.System.Utilities.nuspec → src/biz.dfch.PS.System.Utilities.nuspec b/biz.dfch.PS.System.Utilities.nuspec → src/biz.dfch.PS.System.Utilities.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>biz.dfch.PS.System.Utilities</id>
-        <version>1.0.8</version>
+        <version>1.0.9</version>
         <title>biz.dfch.PS.System.Utilities</title>
         <authors>d-fens GmbH</authors>
         <owners>Ronald Rink</owners>
@@ -23,10 +23,10 @@ You can download this module via [NuGet](http://nuget.org) with [Install-Package
 
 See [d-fens WebSite](http://d-fens.ch/2014/10/15/module-biz-dfch-ps-system-utilities/) or check the [Wiki](https://github.com/dfch/biz.dfch.PS.System.Utilities/wiki) for further description and examples on how to use the module.</description>
         <summary>This PowerShell module contains Cmdlets to perform various actions and utilties/convenience functions such as string conversion and formatting.</summary>
-        <releaseNotes>20151018
+        <releaseNotes>20151029
 
-* Added Update-Signature
-* Added newline support in Send-ShortMessage
+* Fixed install.ps1 script
+* Added -Force parameter to Update-Signature
 </releaseNotes>
         <copyright>(c) 2014-2015 d-fens GmbH</copyright>
         <language>en-US</language>
@@ -36,9 +36,10 @@ See [d-fens WebSite](http://d-fens.ch/2014/10/15/module-biz-dfch-ps-system-utili
         </dependencies>
     </metadata>
     <files>
-        <file src="LICENSE" target="content\LICENSE" />
-        <file src="NOTICE" target="content\NOTICE" />
-        <file src="README.md" target="content\README.md" />
+		<file src="Install.ps1" target="Install.ps1" />
+		<file src="..\LICENSE" target="tools\LICENSE" />
+		<file src="..\NOTICE" target="tools\NOTICE" />
+		<file src="..\README.md" target="tools\README.md" />
         <file src="Assert-CmdletDocumentation.ps1" target="tools\Assert-CmdletDocumentation.ps1" />
         <file src="biz.dfch.PS.System.Utilities.psd1" target="tools\biz.dfch.PS.System.Utilities.psd1" />
         <file src="biz.dfch.PS.System.Utilities.psm1" target="tools\biz.dfch.PS.System.Utilities.psm1" />
@@ -60,20 +61,16 @@ See [d-fens WebSite](http://d-fens.ch/2014/10/15/module-biz-dfch-ps-system-utili
         <file src="Get-Constructor.ps1" target="tools\Get-Constructor.ps1" />
         <file src="Import-Credential.ps1" target="tools\Import-Credential.ps1" />
         <file src="Import-Module.ps1" target="tools\Import-Module.ps1" />
-        <file src="LICENSE" target="tools\LICENSE" />
         <file src="Merge-Hashtable.ps1" target="tools\Merge-Hashtable.ps1" />
         <file src="New-ActivityProgress.ps1" target="tools\New-ActivityProgress.ps1" />
         <file src="New-CustomErrorRecord.ps1" target="tools\New-CustomErrorRecord.ps1" />
         <file src="New-SecurePassword.ps1" target="tools\New-SecurePassword.ps1" />
-        <file src="NOTICE" target="tools\NOTICE" />
-        <file src="README.md" target="tools\README.md" />
         <file src="Remove-ActivityProgress.ps1" target="tools\Remove-ActivityProgress.ps1" />
         <file src="Send-ShortMessage.ps1" target="tools\Send-ShortMessage.ps1" />
         <file src="Set-ActivityProgress.ps1" target="tools\Set-ActivityProgress.ps1" />
         <file src="Set-SslSecurityPolicy.ps1" target="tools\Set-SslSecurityPolicy.ps1" />
         <file src="Test-CmdletDocumentation.ps1" target="tools\Test-CmdletDocumentation.ps1" />
         <file src="Test-StringPattern.ps1" target="tools\Test-StringPattern.ps1" />
         <file src="Update-Signature.ps1" target="tools\Update-Signature.ps1" />
-        <file src="install.ps1" target="install.ps1" />
     </files>
 </package>