feat: Support paths in quotes

Author: steveblackduck

functions/keytool.ps1

@@ -1,5 +1,5 @@
 <#PSScriptInfo
-.VERSION 1.0.0
+.VERSION 1.1.0
 .GUID d73b9c33-1ca5-40c2-bbce-ff18efd062ab
 .AUTHOR Code Dx
 .DESCRIPTION Includes keytool-related helpers
@@ -32,6 +32,12 @@ function Set-KeystorePassword([string] $keystorePath, [string] $keystorePwd, [st
 	}
 }
 
+function Test-KeystoreAlias([string] $keystorePath, [string] $keystorePwd, [string] $aliasName) {
+
+	keytool -list -alias $aliasName -keystore $keystorePath -storepass (Get-KeystorePasswordEscaped $keystorePwd) | Out-Null
+	$?
+}
+
 function Remove-KeystoreAlias([string] $keystorePath, [string] $keystorePwd, [string] $aliasName) {
 
 	keytool -delete -alias $aliasName -keystore $keystorePath -storepass (Get-KeystorePasswordEscaped $keystorePwd)
@@ -57,7 +63,9 @@ function Import-TrustedCaCert([string] $keystorePath, [string] $keystorePwd, [st
 
 	$aliasName = Get-TrustedCaCertAlias $certFile
 
-	Remove-KeystoreAlias $keystorePath $keystorePwd $aliasName
+	if (Test-KeystoreAlias $keystorePath $keystorePwd $aliasName) {
+		Remove-KeystoreAlias $keystorePath $keystorePwd $aliasName
+	}
 	Add-KeystoreAlias $keystorePath $keystorePwd $aliasName $certFile
 }
 

guided-setup.psd1

@@ -12,7 +12,7 @@
 RootModule = 'guided-setup'
 
 # Version number of this module.
-ModuleVersion = '1.14.0'
+ModuleVersion = '1.15.0'
 
 # Supported PSEditions
 CompatiblePSEditions = @('Core')

guided-setup.psm1

@@ -754,10 +754,10 @@ class IntegerQuestion : Question {
 
 class PathQuestion : Question {
 
-	[microsoft.powershell.commands.testpathtype] $type
+	[bool] $isDirectory
 
-	PathQuestion([string] $promptText, [microsoft.powershell.commands.testpathtype] $type, [bool] $allowEmptyResponse) : base($promptText) {
-		$this.type = $type
+	PathQuestion([string] $promptText, [bool] $isDirectory, [bool] $allowEmptyResponse) : base($promptText) {
+		$this.isDirectory = $isDirectory
 		$this.allowEmptyResponse = $allowEmptyResponse
 	}
 
@@ -774,22 +774,33 @@ class PathQuestion : Question {
 				break
 			}
 
-			if (Test-Path $this.response -PathType $this.type) {
+			$pathType = 'Leaf'
+			if ($this.isDirectory) {
+				$pathType = 'Container'
+			}
+
+			if (Test-Path $this.response -PathType $pathType) {
+				break
+			}
+
+			$path = $this.response.Trim("'").Trim('"')
+			if (Test-Path $path -PathType $pathType) {
+				$this.response = $path
 				break
 			}
 
-			$pathType = 'file'
-			if ($this.type -eq [microsoft.powershell.commands.testpathtype]::Container) {
-				$pathType = 'directory'
+			$pathTypeMessage = 'file'
+			if ($this.isDirectory) {
+				$pathTypeMessage = 'directory'
 			}
-			Write-Host "Unable to read $pathType '$($this.response)' - the $pathType may not exist or you may not have permissions to read it - please enter another $pathType path"
+			Write-Host "Unable to read $pathTypeMessage '$($this.response)' - the $pathTypeMessage may not exist or you may not have permissions to read it - please enter another $pathTypeMessage path"
 		}
 	}
 }
 
 class CertificateFileQuestion : PathQuestion {
 
-	CertificateFileQuestion([string] $promptText, [bool] $allowEmptyResponse) : base($promptText, [microsoft.powershell.commands.testpathtype]::leaf, $allowEmptyResponse) {
+	CertificateFileQuestion([string] $promptText, [bool] $allowEmptyResponse) : base($promptText, $false, $allowEmptyResponse) {
 	}
 
 	[void]Prompt() {