Skip to content
This repository was archived by the owner on Jan 10, 2024. It is now read-only.

Commit 04ef6dd

Browse files
author
Roman
committed
bug fixes and 1.0.1
1 parent a7a6302 commit 04ef6dd

File tree

3 files changed

+35
-20
lines changed

3 files changed

+35
-20
lines changed

WindowsToolbox.pssproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
<ApplicationIconPath>C:\Users\Roman\Projects\WinTweakers\WindowsToolbox\toolbox.ico</ApplicationIconPath>
1919
<Obfuscate>False</Obfuscate>
2020
<PackagePlatform>x86</PackagePlatform>
21+
<PreBuildScript>
22+
</PreBuildScript>
23+
<FileDescription>A powerful but simple, easy to use toolbox for Windows 10 / 11. </FileDescription>
24+
<ProductVersion>1.0.1</ProductVersion>
25+
<StartupFile>main.ps1</StartupFile>
2126
</PropertyGroup>
2227
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2328
<DebugSymbols>true</DebugSymbols>

library/GeneralFunctions.psm1

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@ function Info {
3030
Write-Output ""
3131
Write-Output ""
3232
Write-Output "Please read before using WindowsToolbox"
33-
Write-Output "- None of the scripts have configs (for now), you have to edit them to your liking beforehand."
34-
Write-Output "- Windows 10 and 11 are the only supported Windows versions (until Windows 12?)"
35-
Write-Output "- There is no undo (for now), all scripts are provided AS-IS and you use them at your own risk"
33+
Write-Output "- None of the functions have configs (for now), you have to edit them to your liking beforehand."
34+
Write-Output "- Windows 10 and 11 are the only supported Windows versions (for now)."
35+
Write-Output "- There is no undo (for now), all scripts are provided AS IS. You use them at your own risk."
3636
if ($build -ne "10.0.17134") {
3737
Write-Output "- To Use $global:notpkgmgr instead of $global:pkgmgr edit $env:APPDATA\WindowsToolbox\config.json."
3838
}
39-
Write-Output "- Navigation: Use the arrow keys to navigate, Enter to select and Esc to go back"
39+
Write-Output "- Navigation: Use the arrow keys to navigate, Enter to select and ESC to go back"
4040
Write-Output ""
41-
Write-Output "Stuff that breaks core functions (very unlikely to be fixed cuz this is Windows we're talking about)"
41+
Write-Output "Things that break core functions (Very unlikely to be fixed)"
4242
Write-Output "- Disable ShellExperienceHost"
4343
Write-Output "- Disable SearchUI"
4444
Write-Output ""
45-
Write-Output "Stuff that breaks Windows 11 (will be fixed ofc):"
46-
Write-Output "- Disabling telemetry (if using insider)"
45+
Write-Output "Things that break Windows 11 (will be fixed):"
46+
Write-Output "- Disabling telemetry (Disables updates. See #7)"
4747
Write-Output ""
4848
Write-Output ""
4949
Read-Host "Press Enter to continue"
@@ -57,12 +57,12 @@ function InstallChoco {
5757
choco feature enable -n allowGlobalConfirmation
5858
} else {
5959
choco feature enable -n allowGlobalConfirmation
60-
Write-Output "Chocolatey Version $testchoco is already installed"
60+
Write-Output "Chocolatey is already installed"
6161
}
6262
}
6363

6464
function InstallWSL {
65-
Write-Output "Installing Linux Subsystem..."
65+
Write-Output "Installing WSL..."
6666
Get-WindowsOptionalFeature -Online | Where-Object { $_.FeatureName -eq "Microsoft-Windows-Subsystem-Linux" } | Enable-WindowsOptionalFeature -Online -NoRestart -WarningAction SilentlyContinue | Out-Null
6767
}
6868

main.ps1

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,31 @@ Set-Location -Path $PSScriptRoot
3636
Set-ExecutionPolicy Unrestricted -Scope CurrentUser
3737
Get-ChildItem -Recurse *.ps*1 | Unblock-File
3838

39-
Import-Module -DisableNameChecking $PSScriptRoot\library\Write-Menu.psm1
40-
Import-Module -DisableNameChecking $PSScriptRoot\library\WinCore.psm1
41-
Import-Module -DisableNameChecking $PSScriptRoot\library\PrivacyFunctions.psm1
42-
Import-Module -DisableNameChecking $PSScriptRoot\library\Tweaks.psm1
43-
Import-Module -DisableNameChecking $PSScriptRoot\library\GeneralFunctions.psm1
44-
Import-Module -DisableNameChecking $PSScriptRoot\library\DebloatFunctions.psm1
45-
Import-Module -DisableNameChecking $PSScriptRoot\library\UndoFunctions.psm1
39+
Import-Module .\library\Write-Menu.psm1 -DisableNameChecking
40+
Import-Module .\library\WinCore.psm1 -DisableNameChecking
41+
Clear-Host
42+
Import-Module .\library\PrivacyFunctions.psm1 -DisableNameChecking
43+
Import-Module .\library\Tweaks.psm1 -DisableNameChecking
44+
Import-Module .\library\GeneralFunctions.psm1 -DisableNameChecking
45+
Import-Module .\library\DebloatFunctions.psm1 -DisableNameChecking
46+
Import-Module .\library\UndoFunctions.psm1 -DisableNameChecking
4647

4748
$title = "Windows Toolbox $version"
4849
$host.UI.RawUI.WindowTitle = $title
4950
$build = (Get-CimInstance Win32_OperatingSystem).version
5051

5152
[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
5253

54+
55+
56+
Write-Host "It is recommended that you create a system restore point."
57+
$reply = Read-Host -Prompt "Make One Now? [y/n]"
58+
if ( $reply -match "[yY]" ) {
59+
Clear-Host
60+
Checkpoint-Computer -Description "BeforeWindowsToolbox" -RestorePointType "MODIFY_SETTINGS"
61+
Read-Host "Press enter to continue"
62+
}
63+
5364
Clear-Host
5465

5566
if ($build -eq "10.0.10240") {
@@ -58,7 +69,6 @@ if ($build -eq "10.0.10240") {
5869
} elseif ($build -eq "10.0.17134") {
5970
Write-Warning "Your Windows Version is too old to run Winget. Using Chocolatey"
6071
$global:pkgmgr = "choco"
61-
Read-Host "Press enter to continue"
6272
Clear-Host
6373
} else {
6474
$global:pkgmgr = "winget"
@@ -228,7 +238,7 @@ $objects = @{
228238
'Hypervisors / Emulators' = "@(
229239
'VMware Workstation Pro',
230240
'VMware Workstation Player',
231-
'HyperV',
241+
'HyperV (Windows 10/11 Pro Only)',
232242
'VirtualBox',
233243
'DOSBox'
234244
)"
@@ -480,7 +490,7 @@ do {
480490
InstallWSL
481491
}
482492

483-
"Hyper-V" {
493+
"Hyper-V (Windows 10/11 Pro Only)" {
484494
InstallHyperV
485495
}
486496

@@ -534,7 +544,7 @@ do {
534544
}
535545
}
536546

537-
# Gaming stuff
547+
# Gaming Menu
538548

539549
"Steam" {
540550
if ($global:pkgmgr -eq "choco") {

0 commit comments

Comments
 (0)