From de30c36dd54c97a06994d9e66c032965e4f03280 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Thu, 8 Aug 2024 14:04:51 +0200 Subject: [PATCH] Move PinnedItem script to proper location --- scripts/Windows/OS/Install.ps1 | 2 +- scripts/{Common => Windows}/Software/PinnedItem/Manage.ps1 | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) rename scripts/{Common => Windows}/Software/PinnedItem/Manage.ps1 (76%) diff --git a/scripts/Windows/OS/Install.ps1 b/scripts/Windows/OS/Install.ps1 index 726a4b7c..315ca0dd 100644 --- a/scripts/Windows/OS/Install.ps1 +++ b/scripts/Windows/OS/Install.ps1 @@ -88,7 +88,7 @@ $null = New-Module { Invoke-Hook "Install-PSModules" -Fallback { Install-Module -AcceptLicense -Force PSWindowsUpdate; Install-Module -AcceptLicense -Force PSScriptAnalyzer; - . "$PSScriptRoot/../../Common/Software/PinnedItem/Manage.ps1"; + . "$PSScriptRoot/../Software/PinnedItem/Manage.ps1"; }; if (-not (Test-PSPackage Selenium.WebDriver)) { diff --git a/scripts/Common/Software/PinnedItem/Manage.ps1 b/scripts/Windows/Software/PinnedItem/Manage.ps1 similarity index 76% rename from scripts/Common/Software/PinnedItem/Manage.ps1 rename to scripts/Windows/Software/PinnedItem/Manage.ps1 index 47e66998..ec97de39 100644 --- a/scripts/Common/Software/PinnedItem/Manage.ps1 +++ b/scripts/Windows/Software/PinnedItem/Manage.ps1 @@ -3,8 +3,8 @@ param ( [hashtable] $Arguments ) -. "$PSScriptRoot/../PowerShell/Module.ps1"; -. "$PSScriptRoot/../../Scripts/Software.ps1"; +. "$PSScriptRoot/../../../Common/Software/PowerShell/Module.ps1"; +. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; $parameters = Get-ModuleInstallerComponents "PinnedItem" -NativeOnly; @@ -17,6 +17,7 @@ $arguments.Add("Installer", $parameters.installer); Start-SoftwareInstaller @parameters -Installer { param( + [scriptblock] $Installer, [hashtable] $Arguments ) @@ -27,5 +28,5 @@ Start-SoftwareInstaller @parameters -Installer { choco install --source windowsFeatures -y $feature; } - & $Arguments.Installer; + & $Arguments.Installer @PSBoundParameters; }