Amend bootstrap blocks

nightroman · Feb 17, 2024 · 17ae0f5 · 17ae0f5
1 parent d6539e8
commit 17ae0f5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/Tasks/01-step-by-step-tutorial/08-bootstrap/tea.build.ps1 b/Tasks/01-step-by-step-tutorial/08-bootstrap/tea.build.ps1
@@ -20,10 +20,10 @@ param(
 )
 
 # bootstrap
-if ($MyInvocation.ScriptName -notlike '*Invoke-Build.ps1') {
+if (!$MyInvocation.ScriptName.EndsWith('Invoke-Build.ps1')) {
 	$ErrorActionPreference = 1
-	if (!(Get-Command Invoke-Build -ErrorAction Ignore)) {
-		Write-Host -ForegroundColor Cyan 'Installing module InvokeBuild...'
+	if (!(Get-Command Invoke-Build -ErrorAction 0)) {
+		Write-Host 'Installing module InvokeBuild...'
 		Install-Module InvokeBuild -Scope CurrentUser -Force
 		Import-Module InvokeBuild
 	}

diff --git a/Tasks/01-step-by-step-tutorial/09-Docker/tea.build.ps1 b/Tasks/01-step-by-step-tutorial/09-Docker/tea.build.ps1
@@ -46,10 +46,10 @@ param(
 )
 
 # bootstrap
-if ($MyInvocation.ScriptName -notlike '*Invoke-Build.ps1') {
+if (!$MyInvocation.ScriptName.EndsWith('Invoke-Build.ps1')) {
 	$ErrorActionPreference = 1
-	if (!(Get-Command Invoke-Build -ErrorAction Ignore)) {
-		Write-Host -ForegroundColor Cyan 'Installing module InvokeBuild...'
+	if (!(Get-Command Invoke-Build -ErrorAction 0)) {
+		Write-Host 'Installing module InvokeBuild...'
 		Install-Module InvokeBuild -Scope CurrentUser -Force
 		Import-Module InvokeBuild
 	}

diff --git a/Tasks/Direct/README.md b/Tasks/Direct/README.md
@@ -12,9 +12,8 @@ param(
 )
 
 # call the build engine with this script and return
-if ($MyInvocation.ScriptName -notlike '*Invoke-Build.ps1') {
-    Invoke-Build $Tasks $MyInvocation.MyCommand.Path @PSBoundParameters
-    return
+if (!$MyInvocation.ScriptName.EndsWith('Invoke-Build.ps1')) {
+    return Invoke-Build $Tasks $MyInvocation.MyCommand.Path @PSBoundParameters
 }
 
 # the usual build script

diff --git a/Tasks/Direct/my.build.ps1 b/Tasks/Direct/my.build.ps1
@@ -37,7 +37,7 @@ param(
 )
 
 # call the build engine with this script and return
-if ($MyInvocation.ScriptName -notlike '*Invoke-Build.ps1') {
+if (!$MyInvocation.ScriptName.EndsWith('Invoke-Build.ps1')) {
 	return Invoke-Build $Tasks $MyInvocation.MyCommand.Path @PSBoundParameters
 }
 

diff --git a/Tests/Fixed.test.ps1 b/Tests/Fixed.test.ps1
@@ -498,9 +498,8 @@ task DoNotMakeScriptParametersNamed {
 		param(
 			[Parameter()]$Tasks
 		)
-		if ($MyInvocation.ScriptName -notlike "*Invoke-Build.ps1") {
-			Invoke-Build -Task $Tasks -File $MyInvocation.MyCommand.Path @PSBoundParameters
-			return
+		if (!$MyInvocation.ScriptName.EndsWith('Invoke-Build.ps1')) {
+			return Invoke-Build $Tasks $MyInvocation.MyCommand.Path @PSBoundParameters
 		}
 		task Test {}
 	}