Skip to content

Commit

Permalink
feat: init AME Wizard v0.7.5 support
Browse files Browse the repository at this point in the history
commit 9a6a962
Merge: 73c71a3 47526d9
Author: he3als <[email protected]>
Date:   Fri Jun 14 07:20:49 2024 +0100

    Merge branch 'main' into new-ame-wizard

commit 73c71a3
Merge: 7c14044 7d65509
Author: he3als <[email protected]>
Date:   Thu Jun 13 20:17:43 2024 +0100

    Merge branch 'main' into new-ame-wizard

commit 7c14044
Author: he3als <[email protected]>
Date:   Thu Jun 13 18:40:31 2024 +0100

    feat: switch to !task action

commit c1580a1
Merge: 4af0441 cfb2416
Author: he3als <[email protected]>
Date:   Thu Jun 13 17:33:12 2024 +0100

    Merge branch 'main' into new-ame-wizard

commit 4af0441
Author: he3als <[email protected]>
Date:   Tue Jun 11 18:14:35 2024 +0100

    fix(local-build): 'Action is taking a long time' fix

commit fe8f437
Author: he3als <[email protected]>
Date:   Tue Jun 11 18:14:12 2024 +0100

    fix(UPGRADECHECK): swap comparison

commit f6204d6
Author: he3als <[email protected]>
Date:   Tue Jun 11 17:52:02 2024 +0100

    feat(playbook.conf): UniqueId

commit f23953d
Author: he3als <[email protected]>
Date:   Mon Jun 10 21:34:04 2024 +0100

    fix(local-build): more fixes for live log

commit c736307
Author: he3als <[email protected]>
Date:   Mon Jun 10 17:52:29 2024 +0100

    feat(local-build): new logs path
  • Loading branch information
he3als committed Jun 14, 2024
1 parent 47526d9 commit ef9efab
Show file tree
Hide file tree
Showing 15 changed files with 206 additions and 244 deletions.
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"!systemPackage: mapping",
"!cmd: mapping",
"!powerShell: mapping",
"!writeStatus: mapping"
"!writeStatus: mapping",
"!task: mapping"
],
"files.associations": {
"playbook.conf": "xml"
Expand Down
10 changes: 9 additions & 1 deletion src/local-build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,17 @@ try {
Copy-Item -Path $customYmlPath -Destination $tempCustomYmlPath -Force
$customYml = Get-Content -Path $tempCustomYmlPath

$liveLogScript = {
$a = Join-Path (Get-ChildItem (Join-Path $([Environment]::GetFolderPath('CommonApplicationData')) '\AME\Logs') -Directory |
Sort-Object LastWriteTime -Descending |
Select-Object -First 1).FullName '\OutputBuffer.txt';
while ($true) { Get-Content -Wait -LiteralPath $a -EA 0 | Write-Output; Start-Sleep 1 }
}
[string]$liveLogText = ($liveLogScript -replace '"','"""' -replace "'","''").Trim() -replace "`r?`n", " "

$actionsIndex = $customYml.IndexOf('actions:')
$newCustomYml = $customYml[0..$actionsIndex] + `
" - !cmd: {command: 'start `"AME Wizard Live Log`" PowerShell -NoP -C `"gc -Wait ..\..\..\Logs\TIOutput.txt -EA 0 | Write-Output; pause`"', exeDir: true}" + `
" - !cmd: {command: 'start `"AME Wizard Live Log`" PowerShell -NoP -C `"$liveLogText`"'}" + `
$customYml[($actionsIndex + 1)..($customYml.Count)]

Set-Content -Path $tempCustomYmlPath -Value $newCustomYml
Expand Down
23 changes: 11 additions & 12 deletions src/playbook/Configuration/custom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,25 +51,24 @@ actions:
powercfg /x hibernate-timeout-ac 0;
powercfg /x hibernate-timeout-dc 0;
- !writeStatus: {status: 'Optimizing PowerShell'}
tasks:
# Configure PowerShell first so that other PowerShell scripts work
# NGEN - .NET assemblies PowerShell optimization
- tweaks\scripts\script-ngen.yml
- tweaks\qol\config-powershell.yml
- !writeStatus: {status: 'Optimizing PowerShell'}
- !task: {path: 'tweaks\scripts\script-ngen.yml'}
- !task: {path: 'tweaks\qol\config-powershell.yml'}

# Cleanup script takes longer to finish so it has its own status
# It's ran here as you can't check when cleanmgr is finished
- tweaks\statuses\status-cleanup.yml
- tweaks\scripts\script-cleanup.yml
- !writeStatus: {status: 'Cleaning up'}
- !task: {path: 'tweaks\scripts\script-cleanup.yml'}

# Set hidden Settings pages
# Done before everything else as scripts will overwrite it
- tweaks\qol\set-hidden-settings-pages.yml
- !task: {path: 'tweaks\qol\set-hidden-settings-pages.yml'}

# Main tasks
- atlas\start.yml
- atlas\services.yml
- atlas\components.yml
- atlas\appx.yml
- tweaks.yml
- !task: {path: 'atlas\start.yml'}
- !task: {path: 'atlas\services.yml'}
- !task: {path: 'atlas\components.yml'}
- !task: {path: 'atlas\appx.yml'}
- !task: {path: 'tweaks.yml'}
364 changes: 181 additions & 183 deletions src/playbook/Configuration/tweaks.yml

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions src/playbook/Configuration/tweaks/statuses/status-cleanup.yml

This file was deleted.

5 changes: 0 additions & 5 deletions src/playbook/Configuration/tweaks/statuses/status-debloat.yml

This file was deleted.

5 changes: 0 additions & 5 deletions src/playbook/Configuration/tweaks/statuses/status-misc.yml

This file was deleted.

This file was deleted.

This file was deleted.

5 changes: 0 additions & 5 deletions src/playbook/Configuration/tweaks/statuses/status-privacy.yml

This file was deleted.

5 changes: 0 additions & 5 deletions src/playbook/Configuration/tweaks/statuses/status-qol.yml

This file was deleted.

5 changes: 0 additions & 5 deletions src/playbook/Configuration/tweaks/statuses/status-scripts.yml

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions src/playbook/Executables/UPGRADECHECK.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function KillAme {
exit 1
}

$version = $version -replace '[^0-9]' -replace '^0+'
$version = [int]($version -replace '[^0-9]' -replace '^0+')

# Check if Atlas is installed
$model = (Get-ItemProperty $oemInfo -Name "Model" -EA 0).Model
Expand Down Expand Up @@ -63,7 +63,7 @@ $guide
}

# Check if user is trying to downgrade
if ($version -gt $installedVersion) {
if ($installedVersion -gt $version) {
@"
You can't downgrade from your current version of Atlas to this older version.
Expand Down
1 change: 1 addition & 0 deletions src/playbook/playbook.conf
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Atlas makes your computer snappier and more private with lots of usability impro
<Requirement>NoPendingUpdates</Requirement>
<Requirement>PluggedIn</Requirement>
</Requirements>
<UniqueId>00000000-0000-4000-6174-6c6173203a33</UniqueId>
<Overhaul>true</Overhaul>
<UseKernelDriver>false</UseKernelDriver>
<ProductCode>64</ProductCode>
Expand Down

0 comments on commit ef9efab

Please sign in to comment.