From 185cadd3c3ca6858d73caee5e1b89a2521a7821c Mon Sep 17 00:00:00 2001 From: couleurm Date: Sun, 28 Jan 2024 19:42:24 +0000 Subject: [PATCH] Autobuild --- Manifests.json | 18 +++++++++--------- Master.ps1 | 17 +++++++++-------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Manifests.json b/Manifests.json index 6ccd9d7..9f43d80 100644 --- a/Manifests.json +++ b/Manifests.json @@ -1,13 +1,10 @@ [ { - "Name": "Optimize-LunarClient", - "Description": "Tunes a selected Lunar Client profile to your liking, it has some good defaults everyone should have (no numbers in scoreboard, modern keybind handling, no achievements, transparent texture packs section, borderless fullscreen..)", - "Path": "/modules/Game & Program tuners/Optimize-LunarClient.ps1", "Parameters": [ { - "Name": "Settings", "Required": "false", "Type": "Array", + "Name": "Settings", "KeyValues": { "Performance": "Turn off performance-hungry settings", "NoCosmetics": "Disable all emotes, cosmetics, wings, hats..", @@ -32,6 +29,9 @@ ] } ], + "Path": "/modules/Game & Program tuners/Optimize-LunarClient.ps1", + "Description": "Tunes a selected Lunar Client profile to your liking, it has some good defaults everyone should have (no numbers in scoreboard, modern keybind handling, no achievements, transparent texture packs section, borderless fullscreen..)", + "Name": "Optimize-LunarClient", "Display Name": "Optimize Lunar Client", "Platform": [ "Linux", @@ -44,14 +44,11 @@ ] }, { - "Name": "Optimize-OBS", - "Description": "Tune your OBS for a specific usecase in the snap of a finger!", - "Path": "/modules/Game & Program tuners/Optimize-OBS.ps1", "Parameters": [ { - "Name": "Encoder", "Required": "false", "Type": "String", + "Name": "Encoder", "KeyValues": { "NVENC": "NVIDIA's Fastest encoder, it lets you record in hundreds of FPS easily", "AMF": "AMD GPUs/Integrated GPUs encoder, not as good as NVENC but can still get out ~240FPS at most", @@ -67,13 +64,16 @@ ] }, { - "Name": "OBS64Path", "Required": "false", "Type": "String", + "Name": "OBS64Path", "KeyValues": {}, "Description": "If you've got a portable install or something, pass in the main OBS binary's path here" } ], + "Path": "/modules/Game & Program tuners/Optimize-OBS.ps1", + "Description": "Tune your OBS for a specific usecase in the snap of a finger!", + "Name": "Optimize-OBS", "Display Name": "Optimize OBS", "Platform": [ "Linux", diff --git a/Master.ps1 b/Master.ps1 index cc7c7e3..2b0cb20 100644 --- a/Master.ps1 +++ b/Master.ps1 @@ -295,14 +295,14 @@ function Get-ScoopApp { $Repos = @{ - main = @{org = 'ScoopInstaller';repo = 'main';branch = 'master'} - extras = @{org = 'ScoopInstaller';repo = 'extras';branch = 'master'} - utils = @{org = 'couleur-tweak-tips';repo = 'utils';branch = 'main'} - nirsoft = @{org = 'kodybrown' ;repo = 'scoop-nirsoft';branch = 'master'} - games = @{org = 'ScoopInstaller';repo = 'games';branch = 'master'} - 'nerd-fonts' = @{org = 'ScoopInstaller';repo = 'nerd-fonts';branch = 'master'} - versions = @{org = 'ScoopInstaller';repo = 'versions';branch = 'master'} - java = @{org = 'ScoopInstaller';repo = 'java';branch = 'master'} + main = @{org = 'ScoopInstaller' ;repo = 'main' ;branch = 'master'} + extras = @{org = 'ScoopInstaller' ;repo = 'extras' ;branch = 'master'} + utils = @{org = 'couleur-tweak-tips' ;repo = 'utils' ;branch = 'main' } + nirsoft = @{org = 'kodybrown' ;repo = 'scoop-nirsoft' ;branch = 'master'} + 'games' = @{org = 'Calinou' ;repo = 'scoop-games' ;branch = 'master'} + 'nerd-fonts' = @{org = 'matthewjberger' ;repo = 'scoop-nerd-fonts' ;branch = 'master'} + versions = @{org = 'ScoopInstaller' ;repo = 'versions' ;branch = 'master'} + java = @{org = 'ScoopInstaller' ;repo = 'java' ;branch = 'master'} } $RepoNames = $Repos.Keys -Split('\r?\n') @@ -344,6 +344,7 @@ function Get-ScoopApp { } } + # Wait-Debugger scoop install $App if ($LASTEXITCODE -ne 0){ $script:FailedToInstall += $App