From d63ebfd3868609fbe0cbf26382c6c1ec20d495f3 Mon Sep 17 00:00:00 2001 From: Asteski Date: Thu, 6 Feb 2025 23:01:13 +0100 Subject: [PATCH 01/15] osh --- bin/menu/x64/osh/start.exe | Bin 0 -> 4096 bytes pwsh/install.ps1 | 112 ++++++++++++++++++++++++------------- 2 files changed, 72 insertions(+), 40 deletions(-) create mode 100644 bin/menu/x64/osh/start.exe diff --git a/bin/menu/x64/osh/start.exe b/bin/menu/x64/osh/start.exe new file mode 100644 index 0000000000000000000000000000000000000000..19ff831fe731e9621c01230bd2b527366b990b1a GIT binary patch literal 4096 zcmeHJO>9(E6h3b{EmN=!iYX8Sy$mI(Ag_fs21rY%?M!8)Erpp*s}S2aZ*JQs?`OR4 z&2+{E=|-Z)M7vQFU0{q0HpYcUfF&7C7=+Oa@u?DJ?EaE z@0_`F?@Yb^5w#Fe6yyGVqHCBXB^3W>wubG_?(3cOZTqc#*R;u7`?4#R&x*oZ7KX!2 z!*#uY^h}CqQfr~#Z`|YcY_}<*ZPT_9wLudLwLeM+ zhLOOKjA4p|xUo|Bc279#L$FR5H};&38G)4HD&X(Nc2pz{J3kj z0bO~-AfIaT)dOA$ApatBVo%jt!wpFhBU;pjFHA@ZTLO!woIPx(Kz5 z)rrwW38JwkQ7x~aen}Ergj(rShFmxh8e~9|*`A1ArpRwyJG*+}-$nbA2@Pc!f7QN{9Pp3e~IWW z=0&;A1j2HceQA+JJb85X&t~WX);I;U|CQNv60;4tAmuUJ%VU-VSlZkkdcIu>e;pX0 zuCNEK;ht)zTyMbuLM6jTAw+65OBvv6sN3ie^+2j3R~!97H^J{KKB~o~OU*8owm_&@Etf# zSpaUKdBl&dAZH*NYPnfgsBaSuO?icq%}>&t<<9H8!f7VFOUUs}PuNzT zGF3m|4xP!r$<2UHr(R3tQq$Rqh17gDHJwZ)p=r`Wnw_DGyqYg8@G^IUn!k<&1#i{Y zCp_W!bedNcOM0uW6lRMwWmqohX5b0R=Ppt{gWHS>s}r_?^Ho?)RRUq8-6fC8uqQ)6 z8$#31mE6E`xIXSVMa$+Q!$sLLxlf_O2rSP%$8DpcR{m&!Lz^!JoNA8J3|o22wt{M7 zSGMHA6lpi$!YgiMNZNMVDS9GkxRrb^29D|lTYh0$nCkVHKaWgk3*%!~JMP?wio0J? z?EAMbBTD71mB%(4 z>6#NpaoTfJ6_Xcbo!J$EF3X4?^{CW}eJ$6lAvdq;_fbQ)Fz$&|g{u!l9Rtp5<>19S zKrGQPeY*OO9f+uVlHtnPg-FLRZw?sVRWpy!uRKIA{T~PdjXV)J6Bt(#_}a_UR-@Zv zM1O|cN;4E0#GJz$y#St~b6BP63{68$gHK>B=|=R0^2Qtx| zLOTyHP8Fpg>Q#6qAuTKGaa3Bw`z0$|rWIf!l30fDCTQq;sFzjC*!2!d>Crg`RUI?% z_3$p1P;Y?Gb#pb1I%G}q9Lm~9QLhh62i>!Qiv6n}TSTEpb1{HD^O8#x{bb3wVccwQoX%A2&ed8V=G= zRY!|O+cMSrpc}{=3N9Qr|9E~eK literal 0 HcmV?d00001 diff --git a/pwsh/install.ps1 b/pwsh/install.ps1 index 0cd3133..4be2a97 100644 --- a/pwsh/install.ps1 +++ b/pwsh/install.ps1 @@ -781,51 +781,83 @@ foreach ($app in $selectedApps) { Write-Host "WinverUWP is already installed." -ForegroundColor Green } Invoke-Output {New-Item -ItemType Directory -Path "$env:LOCALAPPDATA\WinMac\"} - if ((Get-ItemProperty -Path $sabRegPath -ErrorAction SilentlyContinue).WinKeyFunction -eq 0) {Set-ItemProperty -Path $sabRegPath -Name "WinkeyFunction" -Value 1} - $exeKeyPath = "$env:LOCALAPPDATA\WinMac\WindowsKey.exe" - $exeStartPath = "$env:LOCALAPPDATA\WinMac\StartButton.exe" - $folderName = "WinMac" - $taskService = New-Object -ComObject "Schedule.Service" - $taskService.Connect() | Out-Null - $rootFolder = $taskService.GetFolder("\") - try { $existingFolder = $rootFolder.GetFolder($folderName) } catch { $existingFolder = $null } - if ($null -eq $existingFolder) { $rootFolder.CreateFolder($folderName) | Out-Null } - $taskFolder = "\" + $folderName - $principal = New-ScheduledTaskPrincipal -GroupId "BUILTIN\Administrators" -RunLevel Highest - $trigger = New-ScheduledTaskTrigger -AtLogon - $settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -StartWhenAvailable -MultipleInstances IgnoreNew - $actionWinKey = New-ScheduledTaskAction -Execute 'WindowsKey.exe' -WorkingDirectory "$env:LOCALAPPDATA\WinMac\" - $actionStartButton = New-ScheduledTaskAction -Execute "StartButton.exe" -WorkingDirectory "$env:LOCALAPPDATA\WinMac\" - $processes = @("windowskey", "startbutton") - foreach ($process in $processes) { - $runningProcess = Get-Process -Name $process - if ($runningProcess) {Stop-Process -Name $process -Force} + if ($sysType -like "*ARM*"){ + if ((Get-ItemProperty -Path $sabRegPath -ErrorAction SilentlyContinue).WinKeyFunction -eq 0) {Set-ItemProperty -Path $sabRegPath -Name "WinkeyFunction" -Value 1} + $exeKeyPath = "$env:LOCALAPPDATA\WinMac\WindowsKey.exe" + $exeStartPath = "$env:LOCALAPPDATA\WinMac\StartButton.exe" + $folderName = "WinMac" + $taskService = New-Object -ComObject "Schedule.Service" + $taskService.Connect() | Out-Null + $rootFolder = $taskService.GetFolder("\") + try { $existingFolder = $rootFolder.GetFolder($folderName) } catch { $existingFolder = $null } + if ($null -eq $existingFolder) { $rootFolder.CreateFolder($folderName) | Out-Null } + $taskFolder = "\" + $folderName + $principal = New-ScheduledTaskPrincipal -GroupId "BUILTIN\Administrators" -RunLevel Highest + $trigger = New-ScheduledTaskTrigger -AtLogon + $settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -StartWhenAvailable -MultipleInstances IgnoreNew + $actionWinKey = New-ScheduledTaskAction -Execute 'WindowsKey.exe' -WorkingDirectory "$env:LOCALAPPDATA\WinMac\" + $actionStartButton = New-ScheduledTaskAction -Execute "StartButton.exe" -WorkingDirectory "$env:LOCALAPPDATA\WinMac\" + $processes = @("windowskey", "startbutton") + foreach ($process in $processes) { + $runningProcess = Get-Process -Name $process + if ($runningProcess) {Stop-Process -Name $process -Force} + } + Copy-Item -Path ..\bin\menu\arm64\* -Destination "$env:LOCALAPPDATA\WinMac\" -Recurse -Force + Copy-Item -Path ..\bin\menu\startbutton.exe -Destination "$env:LOCALAPPDATA\WinMac\" -Recurse -Force + Get-ChildItem "$env:LOCALAPPDATA\Microsoft\Windows" -Filter "WinX" -Recurse -Force | ForEach-Object { Remove-Item $_.FullName -Recurse -Force } + $descriptionSB = "WinMac Menu Start button trigger - WinMac/Classic start menu trigger, using these keyboard shortcuts: ctrl + esc, left, middle and right mouse click on Start orb." + $descriptionWK = "WinMac Menu Windows key trigger - C# program to trigger WinX menu using Win key, while keeping default and custom shortcuts with Win key supported." + $parentDirectory = Split-Path -Path $PSScriptRoot -Parent + $winxFolderName = "config\winx\Group2" + $winxFolderPath = Join-Path -Path $parentDirectory -ChildPath $winxFolderName + $WinverUWP = (Get-AppxPackage -Name 2505FireCubeStudios.WinverUWP).InstallLocation + $shortcutPath = "$winxFolderPath\8 - System.lnk" + $newTargetPath = "$WinverUWP\WinverUWP.exe" + $WScriptShell = New-Object -ComObject WScript.Shell + $shortcut = $WScriptShell.CreateShortcut($shortcutPath) + $shortcut.TargetPath = $newTargetPath + $shortcut.Save() + Copy-Item -Path "..\config\winx\" -Destination "$env:LOCALAPPDATA\Microsoft\Windows\" -Recurse -Force + Invoke-Output {Register-ScheduledTask -TaskName "Start Button" -Action $actionStartButton -Trigger $trigger -Principal $principal -Settings $settings -TaskPath $taskFolder -Description $descriptionSB} + Invoke-Output {Register-ScheduledTask -TaskName "Windows Key" -Action $actionWinKey -Trigger $trigger -Principal $principal -Settings $settings -TaskPath $taskFolder -Description $descriptionWK} + Start-Process $exeKeyPath + Start-Process $exeStartPath + } + else { + Write-Host "Installing Open-Shell..." -ForegroundColor DarkYellow + $shellExePath = Join-Path $env:PROGRAMFILES "Open-Shell\StartMenu.exe" + winget install --id "Open-Shell.Open-Shell-Menu" --source winget --custom 'ADDLOCAL=StartMenu' --silent | Out-Null + Stop-Process -Name StartMenu -Force | Out-Null + New-Item -Path "Registry::HKEY_CURRENT_USER\Software\OpenShell" -Force | Out-Null + New-Item -Path "Registry::HKEY_CURRENT_USER\Software\OpenShell\OpenShell" -Force | Out-Null + New-Item -Path "Registry::HKEY_CURRENT_USER\Software\OpenShell\StartMenu" -Force | Out-Null + New-Item -Path "Registry::HKEY_CURRENT_USER\Software\OpenShell\OpenShell\Settings" -Force | Out-Null + New-Item -Path "Registry::HKEY_CURRENT_USER\Software\OpenShell\StartMenu\Settings" -Force | Out-Null + Set-ItemProperty -Path "HKCU:\Software\OpenShell\OpenShell\Settings" -Name "Nightly" -Value 0x00000001 + Set-ItemProperty -Path "HKCU:\Software\OpenShell\StartMenu\Settings" -Name "Version" -Value 0x040400bf + Set-ItemProperty -Path "HKCU:\Software\OpenShell\StartMenu\Settings" -Name "DisablePinExt" -Value 1 + Set-ItemProperty -Path "HKCU:\Software\OpenShell\StartMenu\Settings" -Name "EnableContextMenu" -Value 0 + Set-ItemProperty -Path "HKCU:\Software\OpenShell\StartMenu\Settings" -Name "MouseClick" -Value "Command" + Set-ItemProperty -Path "HKCU:\Software\OpenShell\StartMenu\Settings" -Name "ShiftClick" -Value "Command" + Set-ItemProperty -Path "HKCU:\Software\OpenShell\StartMenu\Settings" -Name "WinKey" -Value "Command" + Set-ItemProperty -Path "HKCU:\Software\OpenShell\StartMenu\Settings" -Name "MouseClickCommand" -Value "$env:LOCALAPPDATA\WinMac\start.exe" + Set-ItemProperty -Path "HKCU:\Software\OpenShell\StartMenu\Settings" -Name "ShiftClickCommand" -Value "Nothing" + Set-ItemProperty -Path "HKCU:\Software\OpenShell\StartMenu\Settings" -Name "WinKeyCommand" -Value "$env:LOCALAPPDATA\WinMac\start.exe" + Set-ItemProperty -Path "HKCU:\Software\OpenShell\StartMenu\Settings" -Name "ShiftWin" -Value "Nothing" + Set-ItemProperty -Path "HKCU:\Software\OpenShell\StartMenu\Settings" -Name "ShiftRight" -Value 1 + Set-ItemProperty -Path "HKCU:\Software\OpenShell\StartMenu\Settings" -Name "SearchBox" -Value "Hide" + Remove-Item "$env:LOCALAPPDATA\Microsoft\Windows\WinX" -Recurse -Force + Copy-Item -Path "..\config\winx\" -Destination "$env:LOCALAPPDATA\Microsoft\Windows\" -Recurse -Force + Copy-Item -Path ..\bin\menu\x64\osh\* -Destination "$env:LOCALAPPDATA\WinMac\" -Recurse -Force + Stop-Process -Name Explorer + Start-Process $shellExePath } - if ($sysType -like "*ARM*") {Copy-Item -Path ..\bin\menu\arm64\* -Destination "$env:LOCALAPPDATA\WinMac\" -Recurse -Force } - else {Copy-Item -Path ..\bin\menu\x64\* -Destination "$env:LOCALAPPDATA\WinMac\" -Recurse -Force } - Copy-Item -Path ..\bin\menu\startbutton.exe -Destination "$env:LOCALAPPDATA\WinMac\" -Recurse -Force - Get-ChildItem "$env:LOCALAPPDATA\Microsoft\Windows" -Filter "WinX" -Recurse -Force | ForEach-Object { Remove-Item $_.FullName -Recurse -Force } - $descriptionSB = "WinMac Menu Start button trigger - WinMac/Classic start menu trigger, using these keyboard shortcuts: ctrl + esc, left, middle and right mouse click on Start orb." - $descriptionWK = "WinMac Menu Windows key trigger - C# program to trigger WinX menu using Win key, while keeping default and custom shortcuts with Win key supported." - $parentDirectory = Split-Path -Path $PSScriptRoot -Parent - $winxFolderName = "config\winx\Group2" - $winxFolderPath = Join-Path -Path $parentDirectory -ChildPath $winxFolderName - $WinverUWP = (Get-AppxPackage -Name 2505FireCubeStudios.WinverUWP).InstallLocation - $shortcutPath = "$winxFolderPath\8 - System.lnk" - $newTargetPath = "$WinverUWP\WinverUWP.exe" - $WScriptShell = New-Object -ComObject WScript.Shell - $shortcut = $WScriptShell.CreateShortcut($shortcutPath) - $shortcut.TargetPath = $newTargetPath - $shortcut.Save() - Copy-Item -Path "..\config\winx\" -Destination "$env:LOCALAPPDATA\Microsoft\Windows\" -Recurse -Force - Invoke-Output {Register-ScheduledTask -TaskName "Start Button" -Action $actionStartButton -Trigger $trigger -Principal $principal -Settings $settings -TaskPath $taskFolder -Description $descriptionSB} - Invoke-Output {Register-ScheduledTask -TaskName "Windows Key" -Action $actionWinKey -Trigger $trigger -Principal $principal -Settings $settings -TaskPath $taskFolder -Description $descriptionWK} - Start-Process $exeKeyPath - Start-Process $exeStartPath Write-Host "WinMac Menu installation completed." -ForegroundColor Green } else { Write-Host "Skipping WinMac Menu installation." -ForegroundColor Magenta } + } elseif ($sysType -like "*ARM*") { + } elseif ($osVersion -notlike '*Windows 11*') { Write-Host "WinMac Menu is supported only on Windows 11. Skipping installation." -ForegroundColor Red } elseif ($adminTest -eq $false) { From d5281eef6e6c9d5edf6ab840d306a71cbd58fc23 Mon Sep 17 00:00:00 2001 From: Asteski Date: Thu, 6 Feb 2025 23:26:19 +0100 Subject: [PATCH 02/15] RC --- pwsh/install.ps1 | 6 +++--- pwsh/uninstall.ps1 | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pwsh/install.ps1 b/pwsh/install.ps1 index 4be2a97..e18ffe5 100644 --- a/pwsh/install.ps1 +++ b/pwsh/install.ps1 @@ -2,7 +2,7 @@ param ( [switch]$noGUI, [switch]$debug ) -$version = "0.8.1" +$version = "0.8.2" $date = Get-Date -Format "yy-MM-ddTHHmmss" $logFile = "WinMac_install_log_$date.txt" $transcriptFile = "WinMac_install_transcript_$date.txt" @@ -54,7 +54,7 @@ if (!($noGUI)) { $iconFolderPath = Join-Path -Path $parentDirectory -ChildPath $iconFolderName $topTextBlock = "PowerShell GUI deployment wizard for Windows and macOS hybrid" $bottomTextBlock1 = 'Important Notes:' - $bottomTextBlock2 = 'Please disable Windows Defender/3rd party Anti-virus to prevent issues with applying icons pack or exclude .\bin\iconpack subdirectory in locally cloned WinMac folder.' + $bottomTextBlock2 = 'Please disable Windows Defender/3rd party Anti-virus to prevent issues with applying icons pack or exclude .\bin\iconpack\ subdirectory in locally cloned WinMac folder.' $bottomTextBlock3 = 'PowerShell default profile will be removed and replaced with new one. Please make sure to backup your current profile if needed.' $bottomTextBlock4 = 'The author of this script is not responsible for any damage caused by running it. Highly recommend to create a system restore point before proceeding with the installation process to ensure you can revert any changes if necessary.' $bottomTextBlock5 = 'For guide on how to use the script, please refer to the Wiki page on WinMac GitHub page: https://github.com/Asteski/WinMac/wiki' @@ -302,7 +302,7 @@ before proceeding with the installation process to ensure you can revert any changes if necessary. Please disable Windows Defender/3rd party Anti-virus to prevent issues -with applying icons pack or exclude ".\bin\iconpack" subdirectory +with applying icons pack or exclude ".\bin\iconpack\" subdirectory in locally cloned WinMac folder. For guide on how to use the script, please refer to the Wiki page diff --git a/pwsh/uninstall.ps1 b/pwsh/uninstall.ps1 index 9730bea..6a234ec 100644 --- a/pwsh/uninstall.ps1 +++ b/pwsh/uninstall.ps1 @@ -2,7 +2,7 @@ param ( [switch]$noGUI, [switch]$debug ) -$version = "0.8.1" +$version = "0.8.2" $date = Get-Date -Format "yy-MM-ddTHHmmss" $logFile = "WinMac_uninstall_log_$date.txt" $transcriptFile = "WinMac_uninstall_transcript_$date.txt" From 9db7dbc898f51ff4eb6a5f6a95a3c2ed26a82e18 Mon Sep 17 00:00:00 2001 From: Asteski Date: Thu, 6 Feb 2025 23:29:52 +0100 Subject: [PATCH 03/15] RC --- pwsh/install.ps1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pwsh/install.ps1 b/pwsh/install.ps1 index e18ffe5..ac67249 100644 --- a/pwsh/install.ps1 +++ b/pwsh/install.ps1 @@ -54,7 +54,7 @@ if (!($noGUI)) { $iconFolderPath = Join-Path -Path $parentDirectory -ChildPath $iconFolderName $topTextBlock = "PowerShell GUI deployment wizard for Windows and macOS hybrid" $bottomTextBlock1 = 'Important Notes:' - $bottomTextBlock2 = 'Please disable Windows Defender/3rd party Anti-virus to prevent issues with applying icons pack or exclude .\bin\iconpack\ subdirectory in locally cloned WinMac folder.' + $bottomTextBlock2 = 'Please disable Windows Defender/3rd party Anti-virus or exclude .\bin\iconpack\ subdirectory for locally cloned WinMac folder in Defender, to prevent issues with applying icons pack.' $bottomTextBlock3 = 'PowerShell default profile will be removed and replaced with new one. Please make sure to backup your current profile if needed.' $bottomTextBlock4 = 'The author of this script is not responsible for any damage caused by running it. Highly recommend to create a system restore point before proceeding with the installation process to ensure you can revert any changes if necessary.' $bottomTextBlock5 = 'For guide on how to use the script, please refer to the Wiki page on WinMac GitHub page: https://github.com/Asteski/WinMac/wiki' @@ -296,15 +296,15 @@ components. PowerShell profile files will be removed and replaced with new ones. Please make sure to backup your current profiles if needed. +Please disable Windows Defender/3rd party Anti-virus +or exclude .\bin\iconpack\ subdirectory for locally cloned WinMac folder +in Defender, to prevent issues with applying icons pack. + The author of this script is not responsible for any damage caused by running it. Highly recommend to create a system restore point before proceeding with the installation process to ensure you can revert any changes if necessary. -Please disable Windows Defender/3rd party Anti-virus to prevent issues -with applying icons pack or exclude ".\bin\iconpack\" subdirectory -in locally cloned WinMac folder. - For guide on how to use the script, please refer to the Wiki page on WinMac GitHub page: From 3e4902c59188fcb7cde80316e3bf7bf536c39b09 Mon Sep 17 00:00:00 2001 From: Asteski Date: Thu, 6 Feb 2025 23:41:37 +0100 Subject: [PATCH 04/15] RC --- pwsh/install.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pwsh/install.ps1 b/pwsh/install.ps1 index ac67249..6239bd6 100644 --- a/pwsh/install.ps1 +++ b/pwsh/install.ps1 @@ -884,7 +884,7 @@ foreach ($app in $selectedApps) { # Stahky "7" { Write-Host "Installing Stahky..." -ForegroundColor Yellow - $url = "https://github.com/joedf/stahky/releases/download/v0.1.0.9/stahky_U64_v0.1.0.9.zip" + $url = "https://github.com/joedf/stahky/releases/download/v0.2.0.1/stahky_U64_v0.2.0.1.zip" $outputPath = "..\stahky_U64.zip" $exePath = "$env:LOCALAPPDATA\Stahky" Invoke-Output {New-Item -ItemType Directory -Path $exePath -Force} From 3a4ed741992ec4f2eac82c54788b25471ca250d6 Mon Sep 17 00:00:00 2001 From: Asteski Date: Thu, 6 Feb 2025 23:46:10 +0100 Subject: [PATCH 05/15] updated README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 06dd13c..d69342a 100644 --- a/README.md +++ b/README.md @@ -123,6 +123,7 @@ List of utilities and their creators, used with WinMac: - [PowerToys](https://learn.microsoft.com/en-us/windows/powertoys/) by Microsoft - [Everything](https://www.voidtools.com/) by David Carpenter - [StartAllBack](https://www.startallback.com/) by Tihiy +- [Open-Shell Menu](https://open-shell.github.io/Open-Shell-Menu/) by Open-Shell - [TopNotify](https://github.com/SamsidParty/TopNotify) by SamsidParty - [Stahky](https://github.com/joedf/stahky) by joedf - [AutoHotkey](https://www.autohotkey.com/) by AutoHotkey Foundation From 66634dfe1e4047bcdc8d1fd9a3a19db02e372414 Mon Sep 17 00:00:00 2001 From: Asteski Date: Fri, 7 Feb 2025 00:09:02 +0100 Subject: [PATCH 06/15] updated install.ps1 --- pwsh/install.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pwsh/install.ps1 b/pwsh/install.ps1 index 6239bd6..0d8b840 100644 --- a/pwsh/install.ps1 +++ b/pwsh/install.ps1 @@ -560,8 +560,8 @@ foreach ($app in $selectedApps) { # PowerToys "1" { Write-Host "Installing PowerToys..." -ForegroundColor Yellow - winget configure --enable | Out-Null - pwsh -NoProfile -Command "winget configure ..\config\powertoys\powertoys.dsc.yaml --accept-configuration-agreements | Out-Null" + winget configure --enable + pwsh -NoProfile -Command "winget configure ..\config\powertoys\powertoys.dsc.yaml --accept-configuration-agreements" # Start-Process pwsh -ArgumentList "-NoProfile -Command winget configure ..\config\powertoys\powertoys.dsc.yaml --accept-configuration-agreements | Out-Null" -Wait Copy-Item -Path "..\config\powertoys\ptr\ptr.exe" -Destination "$env:LOCALAPPDATA\PowerToys\" -Recurse -Force if ($blueOrYellow -eq 'B' -or $blueOrYellow -eq 'b') { From 0bb852c1b0bd29ca2d7925635b09de60fdcc9746 Mon Sep 17 00:00:00 2001 From: Asteski Date: Fri, 7 Feb 2025 02:16:19 +0100 Subject: [PATCH 07/15] updated uninstall.ps1 --- pwsh/uninstall.ps1 | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pwsh/uninstall.ps1 b/pwsh/uninstall.ps1 index 6a234ec..8393a8b 100644 --- a/pwsh/uninstall.ps1 +++ b/pwsh/uninstall.ps1 @@ -3,6 +3,7 @@ param ( [switch]$debug ) $version = "0.8.2" +$sysType = (Get-WmiObject -Class Win32_ComputerSystem).SystemType $date = Get-Date -Format "yy-MM-ddTHHmmss" $logFile = "WinMac_uninstall_log_$date.txt" $transcriptFile = "WinMac_uninstall_transcript_$date.txt" @@ -437,12 +438,18 @@ foreach ($app in $selectedApps) { # WinMac Menu "5" { Write-Host "Uninstalling WinMac Menu..." -ForegroundColor Yellow - Stop-Process -Name WindowsKey -Force - Stop-Process -Name StartButton -Force + if ($sysType -like "*ARM*"){ + Stop-Process -Name WindowsKey -Force + Stop-Process -Name StartButton -Force + $tasks = Get-ScheduledTask -TaskPath "\WinMac\" -ErrorAction SilentlyContinue | Where-Object { $_.TaskName -match 'Start Button|Windows Key' } + foreach ($task in $tasks) { Unregister-ScheduledTask -TaskName $task.TaskName -Confirm:$false } + Get-ChildItem "$env:LOCALAPPDATA\WinMac" | Where-Object { $_.Name -match 'startbutton|windowskey' } | Remove-Item -Recurse -Force + } + else { + Stop-Process -Name startmenu -Force | Out-Null + winget uninstall --id "Open-Shell.Open-Shell-Menu" --source winget --force | Out-Null + } Invoke-Output { Uninstall-WinGetPackage -name "Winver UWP" } - $tasks = Get-ScheduledTask -TaskPath "\WinMac\" -ErrorAction SilentlyContinue | Where-Object { $_.TaskName -match 'Start Button|Windows Key' } - foreach ($task in $tasks) { Unregister-ScheduledTask -TaskName $task.TaskName -Confirm:$false } - Get-ChildItem "$env:LOCALAPPDATA\WinMac" | Where-Object { $_.Name -match 'startbutton|windowskey' } | Remove-Item -Recurse -Force Get-ChildItem "$env:LOCALAPPDATA\Microsoft\Windows" -Filter "WinX" -Recurse -Force | ForEach-Object { Remove-Item $_.FullName -Recurse -Force } Expand-Archive -Path "..\config\WinX-default.zip" -Destination "$env:LOCALAPPDATA\Microsoft\Windows\" -Force $sabRegPath = "HKCU:\Software\StartIsBack" From ef2f85a01abf53a7a3aabfb07317276d3366b057 Mon Sep 17 00:00:00 2001 From: Asteski Date: Fri, 7 Feb 2025 08:09:34 +0100 Subject: [PATCH 08/15] added defender warning --- pwsh/install.ps1 | 52 +++++++++++++++++++++++++++------------------- pwsh/uninstall.ps1 | 39 +++++++++++++++++++++------------- 2 files changed, 55 insertions(+), 36 deletions(-) diff --git a/pwsh/install.ps1 b/pwsh/install.ps1 index 0d8b840..db46f22 100644 --- a/pwsh/install.ps1 +++ b/pwsh/install.ps1 @@ -1265,28 +1265,38 @@ IconResource=C:\WINDOWS\System32\imageres.dll,-87 Remove-Item -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\{f874310e-b6b7-47dc-bc84-b9e6b38f5903}" -Force | Out-Null Remove-Item -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\{e88865ea-0e1c-4e20-9aa6-edcd0212c87c}" -Force | Out-Null ## Icons Pack - if ((Get-ItemProperty -Path $regPath -Name "IconPack" -ErrorAction SilentlyContinue).IconPack -ne 1) { - if ($blueOrYellow -eq "B" -or $blueOrYellow -eq "b") { - $exePath = "..\bin\iconpack\iconpack_blue_folders.exe" - } - elseif ($blueOrYellow -eq "Y" -or $blueOrYellow -eq "y") { - $exePath = "..\bin\iconpack\iconpack_yellow_folders.exe" - } - $arguments = "/S" - Write-Host "Deploying icon pack..." -ForegroundColor DarkYellow - Start-Process -FilePath $exePath -ArgumentList $arguments -NoNewWindow - Set-ItemProperty -Path $regPath -Name "IconPack" -Value 1 | Out-Null - Start-Sleep -s 55 - if ($blueOrYellow -eq "B" -or $blueOrYellow -eq "b") { - $shortcutPath = "$env:APPDATA\Microsoft\Windows\Start Menu\Programs\File Explorer.lnk" - $systemDllPath = "C:\Windows\System32\imageres.dll" - $iconIndex = 265 # Replace with the desired icon index - $shell = New-Object -ComObject WScript.Shell - $shortcut = $shell.CreateShortcut($shortcutPath) - $shortcut.IconLocation = "$systemDllPath,$iconIndex" - $shortcut.Save() +Write-Host @" +`e[91m$("Please make sure that MS Defender/3rd party tool is disabled, +otherwise MS Defender will block installation of Icon Pack!")`e[0m +"@ + $defender = Read-Host "Do you wat to install Icon Pack? (Y/n)" + if ($defender -eq 'Y' -or $defender -eq 'y') { + if ((Get-ItemProperty -Path $regPath -Name "IconPack" -ErrorAction SilentlyContinue).IconPack -ne 1) { + if ($blueOrYellow -eq "B" -or $blueOrYellow -eq "b") { + $exePath = "..\bin\iconpack\iconpack_blue_folders.exe" + } + elseif ($blueOrYellow -eq "Y" -or $blueOrYellow -eq "y") { + $exePath = "..\bin\iconpack\iconpack_yellow_folders.exe" + } + $arguments = "/S" + Write-Host "Deploying icon pack..." -ForegroundColor DarkYellow + Start-Process -FilePath $exePath -ArgumentList $arguments -NoNewWindow + Set-ItemProperty -Path $regPath -Name "IconPack" -Value 1 | Out-Null + Start-Sleep -s 55 + if ($blueOrYellow -eq "B" -or $blueOrYellow -eq "b") { + $shortcutPath = "$env:APPDATA\Microsoft\Windows\Start Menu\Programs\File Explorer.lnk" + $systemDllPath = "C:\Windows\System32\imageres.dll" + $iconIndex = 265 # Replace with the desired icon index + $shell = New-Object -ComObject WScript.Shell + $shortcut = $shell.CreateShortcut($shortcutPath) + $shortcut.IconLocation = "$systemDllPath,$iconIndex" + $shortcut.Save() + } } - } + } + else { + Write-Host "Icon Pack installation skipped." -ForegroundColor Red + } Stop-Process -Name explorer -Force Write-Host "Configuring Other Settings completed." -ForegroundColor Green } diff --git a/pwsh/uninstall.ps1 b/pwsh/uninstall.ps1 index 8393a8b..d2c4f3f 100644 --- a/pwsh/uninstall.ps1 +++ b/pwsh/uninstall.ps1 @@ -587,23 +587,32 @@ uint fWinIni); New-Item -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\{f874310e-b6b7-47dc-bc84-b9e6b38f5903}" -Force | Out-Null New-Item -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\{e88865ea-0e1c-4e20-9aa6-edcd0212c87c}" -Force | Out-Null Invoke-Output { Remove-Item -Path "$env:LOCALAPPDATA\WinMac\theme.ps1" } - Set-ItemProperty -Path $regPath -Name "IconPack" -Value 0 | Out-Null - Invoke-Output { Uninstall-WinGetPackage -name 'IconPack Installer' } - while (Get-WinGetPackage -name 'IconPack Installer' -ErrorAction SilentlyContinue) { - Start-Sleep -Seconds 5 - } - Stop-Process -Name explorer -Force - $endTime = (Get-Date).AddMinutes(5) - do { - try { - if ((Get-ChildItem -Path "C:\IconPack" -Recurse | Measure-Object).Count -eq 0) { - Remove-Item -Path "C:\IconPack" -Recurse -Force -ErrorAction Stop - } - $success = $true - } catch { + Write-Host @" +`e[91m$("Please make sure that MS Defender/3rd party tool is disabled, +otherwise MS Defender will block uninstallation of Icon Pack!")`e[0m +"@ + $defender = Read-Host "Do you wat to uninstall Icon Pack? (Y/n)" + if ($defender -eq 'Y' -or $defender -eq 'y') { + Set-ItemProperty -Path $regPath -Name "IconPack" -Value 0 | Out-Null + Invoke-Output { Uninstall-WinGetPackage -name 'IconPack Installer' } + while (Get-WinGetPackage -name 'IconPack Installer' -ErrorAction SilentlyContinue) { Start-Sleep -Seconds 5 } - } until ($success -or (Get-Date) -ge $endTime) + Stop-Process -Name explorer -Force + $endTime = (Get-Date).AddMinutes(5) + do { + try { + if ((Get-ChildItem -Path "C:\IconPack" -Recurse | Measure-Object).Count -eq 0) { + Remove-Item -Path "C:\IconPack" -Recurse -Force -ErrorAction Stop + } + $success = $true + } catch { + Start-Sleep -Seconds 5 + } + } until ($success -or (Get-Date) -ge $endTime) + else { + Write-Host "Icon Pack uninstallation skipped." -ForegroundColor Red + } Write-Host "Uninstalling Other Settings completed." -ForegroundColor Green } } From a2b00c51a7a97b519229b1b55022f826620b623b Mon Sep 17 00:00:00 2001 From: Asteski Date: Fri, 7 Feb 2025 08:12:13 +0100 Subject: [PATCH 09/15] added defender warning --- pwsh/install.ps1 | 2 +- pwsh/uninstall.ps1 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pwsh/install.ps1 b/pwsh/install.ps1 index db46f22..4a90f11 100644 --- a/pwsh/install.ps1 +++ b/pwsh/install.ps1 @@ -1270,7 +1270,7 @@ Write-Host @" otherwise MS Defender will block installation of Icon Pack!")`e[0m "@ $defender = Read-Host "Do you wat to install Icon Pack? (Y/n)" - if ($defender -eq 'Y' -or $defender -eq 'y') { + if ($defender -eq 'Y' -or $defender -eq 'y') { if ((Get-ItemProperty -Path $regPath -Name "IconPack" -ErrorAction SilentlyContinue).IconPack -ne 1) { if ($blueOrYellow -eq "B" -or $blueOrYellow -eq "b") { $exePath = "..\bin\iconpack\iconpack_blue_folders.exe" diff --git a/pwsh/uninstall.ps1 b/pwsh/uninstall.ps1 index d2c4f3f..e903375 100644 --- a/pwsh/uninstall.ps1 +++ b/pwsh/uninstall.ps1 @@ -614,6 +614,7 @@ otherwise MS Defender will block uninstallation of Icon Pack!")`e[0m Write-Host "Icon Pack uninstallation skipped." -ForegroundColor Red } Write-Host "Uninstalling Other Settings completed." -ForegroundColor Green + } } } } From ab0c42dbbded8735475361dce042d7ba7a7f2ab0 Mon Sep 17 00:00:00 2001 From: Asteski Date: Fri, 7 Feb 2025 09:27:23 +0100 Subject: [PATCH 10/15] updated uninstall.ps1 --- pwsh/install.ps1 | 6 +++--- pwsh/uninstall.ps1 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pwsh/install.ps1 b/pwsh/install.ps1 index 4a90f11..ae96858 100644 --- a/pwsh/install.ps1 +++ b/pwsh/install.ps1 @@ -1266,10 +1266,10 @@ IconResource=C:\WINDOWS\System32\imageres.dll,-87 Remove-Item -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\{e88865ea-0e1c-4e20-9aa6-edcd0212c87c}" -Force | Out-Null ## Icons Pack Write-Host @" -`e[91m$("Please make sure that MS Defender/3rd party tool is disabled, +`e[93m$("Please make sure that MS Defender/3rd party tool is disabled, otherwise MS Defender will block installation of Icon Pack!")`e[0m "@ - $defender = Read-Host "Do you wat to install Icon Pack? (Y/n)" + $defender = Read-Host "Do you want to continue? (Y/n)" if ($defender -eq 'Y' -or $defender -eq 'y') { if ((Get-ItemProperty -Path $regPath -Name "IconPack" -ErrorAction SilentlyContinue).IconPack -ne 1) { if ($blueOrYellow -eq "B" -or $blueOrYellow -eq "b") { @@ -1295,7 +1295,7 @@ otherwise MS Defender will block installation of Icon Pack!")`e[0m } } else { - Write-Host "Icon Pack installation skipped." -ForegroundColor Red + Write-Host "Icon Pack installation skipped." -ForegroundColor DarkoRed } Stop-Process -Name explorer -Force Write-Host "Configuring Other Settings completed." -ForegroundColor Green diff --git a/pwsh/uninstall.ps1 b/pwsh/uninstall.ps1 index e903375..1599364 100644 --- a/pwsh/uninstall.ps1 +++ b/pwsh/uninstall.ps1 @@ -588,10 +588,10 @@ uint fWinIni); New-Item -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\{e88865ea-0e1c-4e20-9aa6-edcd0212c87c}" -Force | Out-Null Invoke-Output { Remove-Item -Path "$env:LOCALAPPDATA\WinMac\theme.ps1" } Write-Host @" -`e[91m$("Please make sure that MS Defender/3rd party tool is disabled, +`e[93m$("Please make sure that MS Defender/3rd party tool is disabled, otherwise MS Defender will block uninstallation of Icon Pack!")`e[0m "@ - $defender = Read-Host "Do you wat to uninstall Icon Pack? (Y/n)" + $defender = Read-Host "Do you want to continue? (Y/n)" if ($defender -eq 'Y' -or $defender -eq 'y') { Set-ItemProperty -Path $regPath -Name "IconPack" -Value 0 | Out-Null Invoke-Output { Uninstall-WinGetPackage -name 'IconPack Installer' } @@ -611,7 +611,7 @@ otherwise MS Defender will block uninstallation of Icon Pack!")`e[0m } } until ($success -or (Get-Date) -ge $endTime) else { - Write-Host "Icon Pack uninstallation skipped." -ForegroundColor Red + Write-Host "Icon Pack uninstallation skipped." -ForegroundColor DarkRed } Write-Host "Uninstalling Other Settings completed." -ForegroundColor Green } From 0c13afb85d8e549d6a4287aaa5a51e0318d8e7bc Mon Sep 17 00:00:00 2001 From: Asteski Date: Fri, 7 Feb 2025 09:36:27 +0100 Subject: [PATCH 11/15] updated uninstall.ps1 --- pwsh/install.ps1 | 2 +- pwsh/uninstall.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pwsh/install.ps1 b/pwsh/install.ps1 index ae96858..c36852f 100644 --- a/pwsh/install.ps1 +++ b/pwsh/install.ps1 @@ -1266,7 +1266,7 @@ IconResource=C:\WINDOWS\System32\imageres.dll,-87 Remove-Item -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\{e88865ea-0e1c-4e20-9aa6-edcd0212c87c}" -Force | Out-Null ## Icons Pack Write-Host @" -`e[93m$("Please make sure that MS Defender/3rd party tool is disabled, +`e[91m$("Please make sure that MS Defender/3rd party tool is disabled, otherwise MS Defender will block installation of Icon Pack!")`e[0m "@ $defender = Read-Host "Do you want to continue? (Y/n)" diff --git a/pwsh/uninstall.ps1 b/pwsh/uninstall.ps1 index 1599364..cee7767 100644 --- a/pwsh/uninstall.ps1 +++ b/pwsh/uninstall.ps1 @@ -588,7 +588,7 @@ uint fWinIni); New-Item -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\{e88865ea-0e1c-4e20-9aa6-edcd0212c87c}" -Force | Out-Null Invoke-Output { Remove-Item -Path "$env:LOCALAPPDATA\WinMac\theme.ps1" } Write-Host @" -`e[93m$("Please make sure that MS Defender/3rd party tool is disabled, +`e[91m$("Please make sure that MS Defender/3rd party tool is disabled, otherwise MS Defender will block uninstallation of Icon Pack!")`e[0m "@ $defender = Read-Host "Do you want to continue? (Y/n)" From 723fa39f317acd06c76e9c154359f72649365ce8 Mon Sep 17 00:00:00 2001 From: Asteski Date: Fri, 7 Feb 2025 12:11:37 +0100 Subject: [PATCH 12/15] updated uninstall.ps1 --- pwsh/uninstall.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pwsh/uninstall.ps1 b/pwsh/uninstall.ps1 index cee7767..4cbb4f1 100644 --- a/pwsh/uninstall.ps1 +++ b/pwsh/uninstall.ps1 @@ -593,6 +593,8 @@ otherwise MS Defender will block uninstallation of Icon Pack!")`e[0m "@ $defender = Read-Host "Do you want to continue? (Y/n)" if ($defender -eq 'Y' -or $defender -eq 'y') { + if ($null -eq $explorerProcess) {Start-Process -FilePath explorer.exe} + Start-Sleep -Seconds 3 Set-ItemProperty -Path $regPath -Name "IconPack" -Value 0 | Out-Null Invoke-Output { Uninstall-WinGetPackage -name 'IconPack Installer' } while (Get-WinGetPackage -name 'IconPack Installer' -ErrorAction SilentlyContinue) { From f1cccad8aa72fda95eddbad19fb71d6d833dabb4 Mon Sep 17 00:00:00 2001 From: Asteski Date: Fri, 7 Feb 2025 12:27:46 +0100 Subject: [PATCH 13/15] updated uninstall.ps1 --- pwsh/install.ps1 | 9 ++++----- pwsh/uninstall.ps1 | 11 ++++++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pwsh/install.ps1 b/pwsh/install.ps1 index c36852f..c6735d1 100644 --- a/pwsh/install.ps1 +++ b/pwsh/install.ps1 @@ -54,7 +54,7 @@ if (!($noGUI)) { $iconFolderPath = Join-Path -Path $parentDirectory -ChildPath $iconFolderName $topTextBlock = "PowerShell GUI deployment wizard for Windows and macOS hybrid" $bottomTextBlock1 = 'Important Notes:' - $bottomTextBlock2 = 'Please disable Windows Defender/3rd party Anti-virus or exclude .\bin\iconpack\ subdirectory for locally cloned WinMac folder in Defender, to prevent issues with applying icons pack.' + $bottomTextBlock2 = 'Please disable Windows Defender/3rd party Anti-virus, to prevent issues with applying icons pack.' $bottomTextBlock3 = 'PowerShell default profile will be removed and replaced with new one. Please make sure to backup your current profile if needed.' $bottomTextBlock4 = 'The author of this script is not responsible for any damage caused by running it. Highly recommend to create a system restore point before proceeding with the installation process to ensure you can revert any changes if necessary.' $bottomTextBlock5 = 'For guide on how to use the script, please refer to the Wiki page on WinMac GitHub page: https://github.com/Asteski/WinMac/wiki' @@ -293,13 +293,12 @@ Write-Host @" This script is responsible for installing all or specific WinMac components. +Please disable Windows Defender/3rd party Anti-virus, to prevent issues +with applying icons pack. + PowerShell profile files will be removed and replaced with new ones. Please make sure to backup your current profiles if needed. -Please disable Windows Defender/3rd party Anti-virus -or exclude .\bin\iconpack\ subdirectory for locally cloned WinMac folder -in Defender, to prevent issues with applying icons pack. - The author of this script is not responsible for any damage caused by running it. Highly recommend to create a system restore point before proceeding with the installation process to ensure you can diff --git a/pwsh/uninstall.ps1 b/pwsh/uninstall.ps1 index 4cbb4f1..682fe18 100644 --- a/pwsh/uninstall.ps1 +++ b/pwsh/uninstall.ps1 @@ -53,9 +53,10 @@ if (!($noGUI)) { $iconFolderPath = Join-Path -Path $parentDirectory -ChildPath $iconFolderName $topTextBlock = "PowerShell GUI uninstaller wizard for Windows and macOS hybrid" $bottomTextBlock1 = 'Important Notes:' - $bottomTextBlock2 = 'PowerShell profile files will be removed, please make sure to backup your current profiles if needed.' - $bottomTextBlock3 = 'Vim and Nexus packages will show prompt to uninstall, please confirm the uninstallations manually.' - $bottomTextBlock4 = 'For guide on how to use the script, please refer to the Wiki page on WinMac GitHub page: https://github.com/Asteski/WinMac/wiki' + $bottomTextBlock2 = 'Please disable Windows Defender/3rd party Anti-virus, to prevent issues with uninsalling icons pack.' + $bottomTextBlock3 = 'PowerShell profile files will be removed, please make sure to backup your current profiles if needed.' + $bottomTextBlock4 = 'Vim and Nexus packages will show prompt to uninstall, please confirm the uninstallations manually.' + $bottomTextBlock5 = 'For guide on how to use the script, please refer to the Wiki page on WinMac GitHub page: https://github.com/Asteski/WinMac/wiki' [xml]$xaml = @" + @@ -245,6 +247,9 @@ Write-Host @" This script is responsible for uninstalling all or specific WinMac components. +Please disable Windows Defender/3rd party Anti-virus, to prevent issues +with uninstalling icons pack. + PowerShell profile files will be removed, please make sure to backup your current profiles if needed. From 91bdcb94c06c4346a5ea4fc194e759e27beb8100 Mon Sep 17 00:00:00 2001 From: Asteski Date: Fri, 7 Feb 2025 14:14:26 +0100 Subject: [PATCH 14/15] RC --- pwsh/install.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pwsh/install.ps1 b/pwsh/install.ps1 index c6735d1..27270cc 100644 --- a/pwsh/install.ps1 +++ b/pwsh/install.ps1 @@ -559,8 +559,8 @@ foreach ($app in $selectedApps) { # PowerToys "1" { Write-Host "Installing PowerToys..." -ForegroundColor Yellow - winget configure --enable - pwsh -NoProfile -Command "winget configure ..\config\powertoys\powertoys.dsc.yaml --accept-configuration-agreements" + winget configure --enable | Out-Null + pwsh -NoProfile -Command "winget configure ..\config\powertoys\powertoys.dsc.yaml --accept-configuration-agreements | Out-Null" # Start-Process pwsh -ArgumentList "-NoProfile -Command winget configure ..\config\powertoys\powertoys.dsc.yaml --accept-configuration-agreements | Out-Null" -Wait Copy-Item -Path "..\config\powertoys\ptr\ptr.exe" -Destination "$env:LOCALAPPDATA\PowerToys\" -Recurse -Force if ($blueOrYellow -eq 'B' -or $blueOrYellow -eq 'b') { From 9ff42cdaef17f9ff744ab4d8973bce0f628d2838 Mon Sep 17 00:00:00 2001 From: Asteski Date: Fri, 7 Feb 2025 17:30:25 +0100 Subject: [PATCH 15/15] updated install.ps1 --- pwsh/install.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/pwsh/install.ps1 b/pwsh/install.ps1 index 27270cc..b294a26 100644 --- a/pwsh/install.ps1 +++ b/pwsh/install.ps1 @@ -561,7 +561,6 @@ foreach ($app in $selectedApps) { Write-Host "Installing PowerToys..." -ForegroundColor Yellow winget configure --enable | Out-Null pwsh -NoProfile -Command "winget configure ..\config\powertoys\powertoys.dsc.yaml --accept-configuration-agreements | Out-Null" - # Start-Process pwsh -ArgumentList "-NoProfile -Command winget configure ..\config\powertoys\powertoys.dsc.yaml --accept-configuration-agreements | Out-Null" -Wait Copy-Item -Path "..\config\powertoys\ptr\ptr.exe" -Destination "$env:LOCALAPPDATA\PowerToys\" -Recurse -Force if ($blueOrYellow -eq 'B' -or $blueOrYellow -eq 'b') { Copy-Item -Path "..\config\powertoys\RunPlugins" -Destination "$env:LOCALAPPDATA\PowerToys\" -Recurse -Force