Streamline names of installer files
This commit is contained in:
parent
aa78b5f335
commit
48322bb1c3
|
@ -202,7 +202,7 @@ $null = New-Module {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (-not (Test-Winget)) {
|
if (-not (Test-Winget)) {
|
||||||
. "$PSScriptRoot/../../Windows/Software/winget/Manage.ps1";
|
. "$PSScriptRoot/../../Windows/Software/winget/Main.ps1";
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -252,7 +252,7 @@ $null = New-Module {
|
||||||
|
|
||||||
Install-ChocoPackage selenium-gecko-driver firefox;
|
Install-ChocoPackage selenium-gecko-driver firefox;
|
||||||
Install-WingetPackage AutoHotkey.AutoHotkey;
|
Install-WingetPackage AutoHotkey.AutoHotkey;
|
||||||
. "$PSScriptRoot/../../Windows/Software/PinnedItem/Manage.ps1";
|
. "$PSScriptRoot/../../Windows/Software/PinnedItem/Main.ps1";
|
||||||
}
|
}
|
||||||
|
|
||||||
Write-Host "Installing PowerShell Modules…";
|
Write-Host "Installing PowerShell Modules…";
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/env fish
|
#!/bin/env fish
|
||||||
begin
|
begin
|
||||||
set -l dir (status dirname)
|
set -l dir (status dirname)
|
||||||
set -l base "$dir/Manage.ps1"
|
set -l base "$dir/Main.ps1"
|
||||||
source "$dir/../../Scripts/software.fish"
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
|
||||||
function configureSW -V dir -V base
|
function configureSW -V dir -V base
|
||||||
|
|
|
@ -4,7 +4,7 @@ begin
|
||||||
source "$dir/../../Scripts/software.fish"
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
|
||||||
function configureSW -V dir
|
function configureSW -V dir
|
||||||
sudo -HE pwsh "$dir/Manage.ps1" Configure
|
sudo -HE pwsh "$dir/Main.ps1" Configure
|
||||||
end
|
end
|
||||||
|
|
||||||
runInstaller $argv
|
runInstaller $argv
|
||||||
|
|
|
@ -4,7 +4,7 @@ begin
|
||||||
source "$dir/../../Scripts/software.fish"
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
|
||||||
function installSW -V dir
|
function installSW -V dir
|
||||||
sudo -HE pwsh "$dir/Manage.ps1"
|
sudo -HE pwsh "$dir/Main.ps1"
|
||||||
end
|
end
|
||||||
|
|
||||||
runInstaller $argv
|
runInstaller $argv
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/env fish
|
#!/bin/env fish
|
||||||
begin
|
begin
|
||||||
set -l dir (status dirname)
|
set -l dir (status dirname)
|
||||||
set -l base "$dir/Manage.ps1"
|
set -l base "$dir/Main.ps1"
|
||||||
source "$(status dirname)/../../Scripts/software.fish"
|
source "$(status dirname)/../../Scripts/software.fish"
|
||||||
|
|
||||||
function configureSW -S -V base
|
function configureSW -S -V base
|
||||||
|
|
|
@ -4,7 +4,7 @@ begin
|
||||||
source "$dir/../../Scripts/software.fish"
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
|
||||||
function installSW -V dir
|
function installSW -V dir
|
||||||
sudo -HE pwsh "$dir/Manage.ps1"
|
sudo -HE pwsh "$dir/Main.ps1"
|
||||||
end
|
end
|
||||||
|
|
||||||
runInstaller $argv
|
runInstaller $argv
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
$softwarePath = "$PSScriptRoot/../../Software";
|
$softwarePath = "$PSScriptRoot/../../Software";
|
||||||
|
|
||||||
$appScripts = @(
|
$appScripts = @(
|
||||||
"$softwarePath/TobiiGhost/Manage.ps1",
|
"$softwarePath/TobiiGhost/Main.ps1",
|
||||||
"$softwarePath/TobiiGameHub/Manage.ps1"
|
"$softwarePath/TobiiGameHub/Main.ps1"
|
||||||
);
|
);
|
||||||
|
|
||||||
Start-SoftwareInstaller @args `
|
Start-SoftwareInstaller @args `
|
|
@ -48,14 +48,14 @@ function Deploy-SoftwareAction {
|
||||||
foreach ($component in $hardware.components) {
|
foreach ($component in $hardware.components) {
|
||||||
switcH ($component) {
|
switcH ($component) {
|
||||||
("ROG Zenith Extreme Alpha") {
|
("ROG Zenith Extreme Alpha") {
|
||||||
& "$mbPath/MarvellEthernet/Manage.ps1" @arguments;
|
& "$mbPath/MarvellEthernet/Main.ps1" @arguments;
|
||||||
& "$mbPath/IntelWiFi/Manage.ps1" @arguments;
|
& "$mbPath/IntelWiFi/Main.ps1" @arguments;
|
||||||
& "$mbPath/IntelBluetooth/Manage.ps1" @arguments;
|
& "$mbPath/IntelBluetooth/Main.ps1" @arguments;
|
||||||
& "$mbPath/AMDChipsetX399/Manage.ps1" @arguments;
|
& "$mbPath/AMDChipsetX399/Main.ps1" @arguments;
|
||||||
& "$driverPath/AMDChipsetX399/Manage.ps1" @arguments;
|
& "$driverPath/AMDChipsetX399/Main.ps1" @arguments;
|
||||||
}
|
}
|
||||||
("Predator Z301C") {
|
("Predator Z301C") {
|
||||||
& "$driverPath/Predator Z301C/Manage.ps1" @arguments;
|
& "$driverPath/Predator Z301C/Main.ps1" @arguments;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -82,7 +82,7 @@ function Deploy-SoftwareAction {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($hardware.eyeX) {
|
if ($hardware.eyeX) {
|
||||||
& "$driverPath/Tobii EyeX/Manage.ps1" @arguments;
|
& "$driverPath/Tobii EyeX/Main.ps1" @arguments;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -91,23 +91,23 @@ function Deploy-SoftwareAction {
|
||||||
$commonSoftware = "$PSScriptRoot/../../Common/Software";
|
$commonSoftware = "$PSScriptRoot/../../Common/Software";
|
||||||
|
|
||||||
# Windows Config
|
# Windows Config
|
||||||
& "$softwarePath/Windows/Manage.ps1" @arguments;
|
& "$softwarePath/Windows/Main.ps1" @arguments;
|
||||||
|
|
||||||
if ($hardware.logitechG) {
|
if ($hardware.logitechG) {
|
||||||
& "$softwarePath/LGHub/Manage.ps1" @arguments;
|
& "$softwarePath/LGHub/Main.ps1" @arguments;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Essentials
|
# Essentials
|
||||||
if ($collections.essential) {
|
if ($collections.essential) {
|
||||||
& "$softwarePath/aliae/Main.ps1" @arguments;
|
& "$softwarePath/aliae/Main.ps1" @arguments;
|
||||||
& "$softwarePath/git/Manage.ps1" @arguments;
|
& "$softwarePath/git/Main.ps1" @arguments;
|
||||||
& "$softwarePath/OpenSSH/Manage.ps1" @arguments;
|
& "$softwarePath/OpenSSH/Main.ps1" @arguments;
|
||||||
& "$softwarePath/PowerShell/Manage.ps1" @arguments;
|
& "$softwarePath/PowerShell/Main.ps1" @arguments;
|
||||||
& "$softwarePath/chocolatey/Manage.ps1" @arguments;
|
& "$softwarePath/chocolatey/Main.ps1" @arguments;
|
||||||
& "$softwarePath/zoxide/Manage.ps1" @arguments;
|
& "$softwarePath/zoxide/Main.ps1" @arguments;
|
||||||
& "$commonSoftware/posh-git/Manage.ps1" @arguments;
|
& "$commonSoftware/posh-git/Main.ps1" @arguments;
|
||||||
& "$commonSoftware/Terminal-Icons/Manage.ps1" @arguments;
|
& "$commonSoftware/Terminal-Icons/Main.ps1" @arguments;
|
||||||
& "$softwarePath/Oh My Posh/Manage.ps1" @arguments;
|
& "$softwarePath/Oh My Posh/Main.ps1" @arguments;
|
||||||
|
|
||||||
if (Get-OSConfig "dualboot") {
|
if (Get-OSConfig "dualboot") {
|
||||||
& "$softwarePath/Ext4Fsd/Main.ps1" @arguments;
|
& "$softwarePath/Ext4Fsd/Main.ps1" @arguments;
|
||||||
|
@ -127,9 +127,9 @@ function Deploy-SoftwareAction {
|
||||||
|
|
||||||
# Common Software
|
# Common Software
|
||||||
if ($collections.common) {
|
if ($collections.common) {
|
||||||
& "$softwarePath/WinSCP/Manage.ps1" @arguments;
|
& "$softwarePath/WinSCP/Main.ps1" @arguments;
|
||||||
& "$softwarePath/Thunderbird/Manage.ps1" @arguments;
|
& "$softwarePath/Thunderbird/Main.ps1" @arguments;
|
||||||
& "$softwarePath/PuTTY/Manage.ps1" @arguments;
|
& "$softwarePath/PuTTY/Main.ps1" @arguments;
|
||||||
|
|
||||||
if ($install) {
|
if ($install) {
|
||||||
Install-ChocoPackage `
|
Install-ChocoPackage `
|
||||||
|
@ -198,11 +198,11 @@ function Deploy-SoftwareAction {
|
||||||
}
|
}
|
||||||
|
|
||||||
# ToDo: Consider hiding behind own config?
|
# ToDo: Consider hiding behind own config?
|
||||||
& "$softwarePath/Ubiquiti UniFi Controller/Manage.ps1" @arguments;
|
& "$softwarePath/Ubiquiti UniFi Controller/Main.ps1" @arguments;
|
||||||
|
|
||||||
# Internet Access
|
# Internet Access
|
||||||
& "$softwarePath/Firefox/Manage.ps1" @arguments;
|
& "$softwarePath/Firefox/Main.ps1" @arguments;
|
||||||
& "$softwarePath/MSEdgeRedirect/Manage.ps1" @arguments;
|
& "$softwarePath/MSEdgeRedirect/Main.ps1" @arguments;
|
||||||
|
|
||||||
if ($collections.fileSync) {
|
if ($collections.fileSync) {
|
||||||
& "$softwarePath/Nextcloud/Main.ps1" @arguments;
|
& "$softwarePath/Nextcloud/Main.ps1" @arguments;
|
||||||
|
@ -260,10 +260,10 @@ function Deploy-SoftwareAction {
|
||||||
}
|
}
|
||||||
|
|
||||||
& "$softwarePath/vscode/Main.ps1" @arguments;
|
& "$softwarePath/vscode/Main.ps1" @arguments;
|
||||||
& "$softwarePath/VisualStudio/Manage.ps1" @arguments;
|
& "$softwarePath/VisualStudio/Main.ps1" @arguments;
|
||||||
|
|
||||||
# Node.js
|
# Node.js
|
||||||
& "$softwarePath/NVS/Manage.ps1" @arguments;
|
& "$softwarePath/NVS/Main.ps1" @arguments;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Gaming
|
# Gaming
|
||||||
|
@ -294,11 +294,11 @@ function Deploy-SoftwareAction {
|
||||||
|
|
||||||
& "$softwarePath/TrackMania Nations Forever/Main.ps1" @arguments;
|
& "$softwarePath/TrackMania Nations Forever/Main.ps1" @arguments;
|
||||||
& "$softwarePath/TrackMania United Forever/Main.ps1" @arguments;
|
& "$softwarePath/TrackMania United Forever/Main.ps1" @arguments;
|
||||||
& "$softwarePath/ManiaPlanet/Manage.ps1" @arguments;
|
& "$softwarePath/ManiaPlanet/Main.ps1" @arguments;
|
||||||
& "$softwarePath/osu!/Manage.ps1" @arguments;
|
& "$softwarePath/osu!/Main.ps1" @arguments;
|
||||||
& "$softwarePath/osu!lazer/Manage.ps1" @arguments;
|
& "$softwarePath/osu!lazer/Main.ps1" @arguments;
|
||||||
& "$softwarePath/RetroArch/Manage.ps1" @arguments;
|
& "$softwarePath/RetroArch/Main.ps1" @arguments;
|
||||||
& "$softwarePath/reWASD/Manage.ps1" @arguments;
|
& "$softwarePath/reWASD/Main.ps1" @arguments;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
. "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1";
|
. "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1";
|
||||||
|
|
||||||
Start-SoftwareInstaller @args `
|
Start-SoftwareInstaller @args `
|
||||||
-Inherit "$PSScriptRoot/../../../Common/Software/Oh My Posh/Manage.ps1" `
|
-Inherit "$PSScriptRoot/../../../Common/Software/Oh My Posh/Main.ps1" `
|
||||||
-Installer {
|
-Installer {
|
||||||
Install-WingetPackage JanDeDobbeleer.OhMyPosh -ArgumentList "--scope", "machine";
|
Install-WingetPackage JanDeDobbeleer.OhMyPosh -ArgumentList "--scope", "machine";
|
||||||
};
|
};
|
|
@ -1,4 +1,4 @@
|
||||||
. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
|
. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
|
||||||
. "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1";
|
. "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1";
|
||||||
|
|
||||||
Start-SoftwareInstaller @args -Inherit "$PSScriptRoot/../../../Common/Software/PowerShell/Manage.ps1";
|
Start-SoftwareInstaller @args -Inherit "$PSScriptRoot/../../../Common/Software/PowerShell/Main.ps1";
|
|
@ -4,7 +4,7 @@
|
||||||
. "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1";
|
. "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1";
|
||||||
|
|
||||||
Start-SoftwareInstaller @args `
|
Start-SoftwareInstaller @args `
|
||||||
-Inherit "$PSScriptRoot/../../../Common/Software/git/Manage.ps1" `
|
-Inherit "$PSScriptRoot/../../../Common/Software/git/Main.ps1" `
|
||||||
-Installer {
|
-Installer {
|
||||||
$params = "/WindowsTerminalProfile";
|
$params = "/WindowsTerminalProfile";
|
||||||
$defaultBranch = Get-OSConfig "git.defaultBranch";
|
$defaultBranch = Get-OSConfig "git.defaultBranch";
|
Loading…
Reference in a new issue