Fix with oscdimg.exe search, ExecutionPolicy, compression, etc.. #319
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| :: Reference from https://github.com/Raphire/Win11Debloat/blob/master/Run.bat licensed under MIT license. | ||
|
|
||
| @echo off | ||
|
|
||
| Powershell -ExecutionPolicy Bypass -Command "& {Start-Process Powershell -ArgumentList '-NoProfile -ExecutionPolicy Bypass -File ""%~dp0tiny11maker.ps1""' -Verb RunAs}" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,24 +2,26 @@ | |
| #Set-PSDebug -Trace 1 | ||
|
|
||
| param ( | ||
| [ValidatePattern('^[c-zC-Z]:$')] | ||
| [string]$ScratchDisk | ||
| ) | ||
|
|
||
| if (-not $ScratchDisk) { | ||
| $ScratchDisk = ((Get-Location).Drive.Name) + ":" | ||
| } else { | ||
| $ScratchDisk = $ScratchDisk + ":" | ||
| } | ||
|
|
||
| Write-Output "Scratch disk set to $ScratchDisk" | ||
|
|
||
| # Check if PowerShell execution is Restricted or AllSigned or Undefined | ||
| $needchange = @("AllSigned", "Restricted", "Undefined") | ||
| $curpolicy = Get-ExecutionPolicy | ||
| if ($curpolicy -in $needchange) { | ||
| Write-Host "Your current PowerShell Execution Policy is set to $curpolicy, which prevents scripts from running. Do you want to change it to RemoteSigned? (yes/no)" | ||
| $response = Read-Host | ||
| if ($response -eq 'yes') { | ||
| Set-ExecutionPolicy RemoteSigned -Scope Process -Confirm:$false | ||
| } else { | ||
| Write-Host "The script cannot be run without changing the execution policy. Exiting..." | ||
| exit | ||
|
|
@@ -42,8 +44,6 @@ if (! $myWindowsPrincipal.IsInRole($adminRole)) | |
| exit | ||
| } | ||
|
|
||
| # Start the transcript and prepare the window | ||
| Start-Transcript -Path "$ScratchDisk\tiny11.log" | ||
|
|
||
|
|
@@ -98,8 +98,9 @@ try { | |
| # This block will catch the error and suppress it. | ||
| } | ||
| New-Item -ItemType Directory -Force -Path "$ScratchDisk\scratchdir" > $null | ||
| Mount-WindowsImage -ImagePath $wimFilePath -Index $index -Path $ScratchDisk\scratchdir | ||
|
|
||
| # Powershell dism module does not have direct equivalent for /Get-Intl | ||
| $imageIntl = & dism /English /Get-Intl "/Image:$($ScratchDisk)\scratchdir" | ||
| $languageLine = $imageIntl -split '\n' | Where-Object { $_ -match 'Default system UI language : ([a-zA-Z]{2}-[a-zA-Z]{2})' } | ||
|
|
||
|
|
@@ -110,45 +111,42 @@ if ($languageLine) { | |
| Write-Host "Default system UI language code not found." | ||
| } | ||
|
|
||
| # Defined in (Microsoft.Dism.Commands.ImageInfoObject).Architecture formatting script | ||
| # 0 -> x86, 5 -> arm(currently unused), 6 -> ia64(currently unused), 9 -> x64, 12 -> arm64 | ||
| switch ((Get-WindowsImage -ImagePath $wimFilePath -Index $index).Architecture) | ||
| { | ||
| 0 { $architecture = "x86" } | ||
| 9 { $architecture = "amd64" } | ||
| 12 { $architecture = "arm64" } | ||
| } | ||
|
|
||
| if ($architecture) { | ||
| Write-Host "Architecture: $architecture" | ||
| } else { | ||
| Write-Host "Architecture information not found." | ||
| } | ||
|
|
||
|
|
||
| Write-Host "Mounting complete! Performing removal of applications...`n" | ||
|
|
||
| $packages = Get-ProvisionedAppxPackage -Path "$ScratchDisk\scratchdir" | | ||
| ForEach-Object { | ||
| $_.PackageName | ||
| } | ||
|
|
||
| $packagePrefixes = 'Clipchamp.Clipchamp_', 'Microsoft.BingNews_', 'Microsoft.BingWeather_', 'Microsoft.GamingApp_', 'Microsoft.GetHelp_', 'Microsoft.Getstarted_', 'Microsoft.MicrosoftOfficeHub_', 'Microsoft.MicrosoftSolitaireCollection_', 'Microsoft.People_', 'Microsoft.PowerAutomateDesktop_', 'Microsoft.Todos_', 'Microsoft.WindowsAlarms_', 'microsoft.windowscommunicationsapps_', 'Microsoft.WindowsFeedbackHub_', 'Microsoft.WindowsMaps_', 'Microsoft.WindowsSoundRecorder_', 'Microsoft.Xbox.TCUI_', 'Microsoft.XboxGamingOverlay_', 'Microsoft.XboxGameOverlay_', 'Microsoft.XboxSpeechToTextOverlay_', 'Microsoft.YourPhone_', 'Microsoft.ZuneMusic_', 'Microsoft.ZuneVideo_', 'MicrosoftCorporationII.MicrosoftFamily_', 'MicrosoftCorporationII.QuickAssist_', 'MicrosoftTeams_', 'Microsoft.549981C3F5F10_' | ||
|
|
||
| $packagesToRemove = $packages | Where-Object { | ||
| $packageName = $_ | ||
| $packagePrefixes -contains ($packagePrefixes | Where-Object { $packageName -like "$_*" }) | ||
| } | ||
| foreach ($package in $packagesToRemove) { | ||
| Write-Host "Removing $package..." | ||
| Remove-AppxProvisionedPackage -Path "$ScratchDisk\scratchdir" -PackageName "$package" | Out-Null | ||
| } | ||
|
|
||
|
|
||
| Write-Host "`nRemoving Edge:" | ||
| Remove-Item -Path "$ScratchDisk\scratchdir\Program Files (x86)\Microsoft\Edge" -Recurse -Force | Out-Null | ||
| Remove-Item -Path "$ScratchDisk\scratchdir\Program Files (x86)\Microsoft\EdgeUpdate" -Recurse -Force | Out-Null | ||
| Remove-Item -Path "$ScratchDisk\scratchdir\Program Files (x86)\Microsoft\EdgeCore" -Recurse -Force | Out-Null | ||
|
|
@@ -388,10 +386,9 @@ Write-Host ' ' | |
| Write-Host "Unmounting image..." | ||
| Dismount-WindowsImage -Path $ScratchDisk\scratchdir -Save | ||
| Write-Host "Exporting image..." | ||
| # Run `Export-WindowsImage` with undocumented CompressionType "LZMS" (which is the same compression used for Recovery from dism.exe) | ||
| Export-WindowsImage -SourceImagePath "$ScratchDisk\tiny11\sources\install.wim" -SourceIndex "$index" -DestinationImagePath "$ScratchDisk\tiny11\sources\install2.wim" -CompressionType "LZMS" | ||
|
There was a problem hiding this comment. Although it is said that Compressiontype Recovery is not supported with PShell, actually |
||
| Move-Item -Path "$ScratchDisk\tiny11\sources\install2.wim" -Destination "$ScratchDisk\tiny11\sources\install.wim" -Force | Out-Null | ||
| Write-Host "Windows image completed. Continuing with boot.wim." | ||
| Start-Sleep -Seconds 2 | ||
| Clear-Host | ||
|
|
@@ -436,22 +433,32 @@ Write-Host "The tiny11 image is now completed. Proceeding with the making of the | |
| Write-Host "Copying unattended file for bypassing MS account on OOBE..." | ||
| Copy-Item -Path "$PSScriptRoot\autounattend.xml" -Destination "$ScratchDisk\tiny11\autounattend.xml" -Force | Out-Null | ||
| Write-Host "Creating ISO image..." | ||
| # Get Windows ADK path from registry(following Visual Studio's winsdk.bat approach). | ||
| $WinSDKPath = [Microsoft.Win32.Registry]::GetValue("HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows Kits\Installed Roots", "KitsRoot10", $null) | ||
| if (!$WinSDKPath) { | ||
| $WinSDKPath = [Microsoft.Win32.Registry]::GetValue("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots", "KitsRoot10", $null) | ||
| } | ||
|
|
||
| if ($WinSDKPath) { | ||
| # Trim the following backslash for path concatenation. | ||
| $WinSDKPath = $WinSDKPath.TrimEnd('\') | ||
| $ADKDepTools = "$WinSDKPath\Assessment and Deployment Kit\Deployment Tools\$hostarchitecture\Oscdimg" | ||
| } | ||
| $localOSCDIMGPath = "$PSScriptRoot\oscdimg.exe" | ||
|
|
||
| if ($ADKDepTools -and [System.IO.File]::Exists("$ADKDepTools\oscdimg.exe")) { | ||
| Write-Host "Will be using oscdimg.exe from system ADK." | ||
| $OSCDIMG = "$ADKDepTools\oscdimg.exe" | ||
| } else { | ||
| Write-Host "oscdimg.exe from system ADK not found. Will be using bundled oscdimg.exe." | ||
|
|
||
| $url = "https://msdl.microsoft.com/download/symbols/oscdimg.exe/3D44737265000/oscdimg.exe" | ||
|
|
||
| if (![System.IO.File]::Exists($localOSCDIMGPath)) { | ||
| Write-Host "Downloading oscdimg.exe..." | ||
| Invoke-WebRequest -Uri $url -OutFile $localOSCDIMGPath | ||
|
|
||
| if ([System.IO.File]::Exists($localOSCDIMGPath)) { | ||
| Write-Host "oscdimg.exe downloaded successfully." | ||
| } else { | ||
| Write-Error "Failed to download oscdimg.exe." | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am curious if this part is actually called, is this for some possible cases where the user tries to run it from powershell they have been using for different activity which could have set ExecutionPolicy to the value that does not allow script to run? I think in normal cases, the user will run it with from the powershell which have the ExecutionPolicy that allow to run custom scripts, and it is inherited, which make it will never be the ones that need to be changed for elevation.