Make install scripts handle lack of 'out' directory

Author: fredemmott

install.ps1

@@ -9,14 +9,25 @@ param (
 )
 
 if ("${LayerPath}" -eq "") {
-	$LayerPath = (Get-Item out/APILayer.json).FullName
+	if (Test-Path out/APILayer.json) {
+		$LayerPath = "out/APILayer.json"
+	} elseif (Test-Path APILayer.json) {
+		$LayerPath = "APILayer.json"
+	}
+}
+
+if ("${LayerPath}" -eq "") {
+	Write-Host "Could not find APILayer.json"
+	return 1
 }
 
 if (-not (Test-Path $LayerPath)) {
 	Write-Host "LayerPath '${LayerPath}' does not exist."
 	return 1
 }
 
+$LayerPath = (Get-Item $LayerPath).FullName
+
 if ($Mode -eq "Before" -or $Mode -eq "After") {
 	if ("${RelativeTo}" -eq "") {
 		Write-Host "Specify -RelativeTo if specifying -Mode Before or -Mode After."

wrap.ps1

@@ -1,7 +1,23 @@
-param (
-	[Parameter(Mandatory = $True)]
-	[string] $RelativeTo
-)
-
-.\install.ps1 -Mode Before -LayerPath (Get-Item out\APILayer.json).FullName -RelativeTo $RelativeTo
-.\install.ps1 -Mode After -LayerPath (Get-Item out\APILayer_Alternate.json).FullName -RelativeTo $RelativeTo
+param (
+	[Parameter(Mandatory = $True)]
+	[string] $RelativeTo
+)
+
+if (Test-Path out/APILayer.json) {
+	$LayerPath = "out/APILayer.json"
+} elseif (Test-Path APILayer.json) {
+	$LayerPath = "APILayer.json"
+}
+
+if ("${LayerPath}" -eq "") {
+	Write-Host "Could not find APILayer.json"
+	return 1
+}
+
+$LayerPath = (Get-Item $LayerPath).FullName
+$AltLayerPath = Join-Path (Get-Item $LayerPath).Directory.FullName "APILayer_Alternate.json"
+
+$Install = Join-Path (Get-Item $PSCommandPath).Directory.FullName "install.ps1"
+
+& $Install -Mode Before -LayerPath $LayerPath -RelativeTo $RelativeTo
+& $Install -Mode After -LayerPath $AltLayerPath -RelativeTo $RelativeTo