From a6dd5aff0a5ec4a4c3b9a5adeedb823c0a684fc6 Mon Sep 17 00:00:00 2001 From: Romain <96626929+Romanitho@users.noreply.github.com> Date: Sat, 9 Apr 2022 17:27:13 +0200 Subject: [PATCH 1/3] Minor changes on Mod functions --- winget-install.ps1 | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/winget-install.ps1 b/winget-install.ps1 index 7948018..cc22c12 100644 --- a/winget-install.ps1 +++ b/winget-install.ps1 @@ -133,14 +133,24 @@ function Confirm-Exist ($AppID){ } #Check if modifications exist in "mods" directory -function Test-Mods ($AppID){ +function Test-ModsInstall ($AppID){ if (Test-Path -Path "$PSScriptRoot\mods\$AppID-install.ps1" -PathType Leaf){ - $Script:ModsInstall = "$PSScriptRoot\mods\$AppID-install.ps1" + $ModsInstall = "$PSScriptRoot\mods\$AppID-install.ps1" + return $ModsInstall } + else{ + return 0 + } +} + +function Test-ModsUninstall ($AppID){ if (Test-Path -Path "$PSScriptRoot\mods\$AppID-uninstall.ps1" -PathType Leaf){ - $Script:ModsUninstall = "$PSScriptRoot\mods\$AppID-uninstall.ps1" + $ModsUninstall = "$PSScriptRoot\mods\$AppID-uninstall.ps1" + return $ModsUninstall + } + else { + return 0 } - return $ModsInstall,$ModsUninstall } #Install function @@ -151,7 +161,7 @@ function Install-App ($AppID){ Write-Log "Installing $AppID..." "Yellow" & $winget install --id $AppID --silent --accept-package-agreements --accept-source-agreements #Check if mods exist - Test-Mods $AppID + Test-ModsInstall $AppID if ($ModsInstall){ Write-Log "Modifications for $AppID during install are being applied..." "Yellow" & "$ModsInstall" @@ -178,7 +188,7 @@ function Uninstall-App ($AppID){ Write-Log "Uninstalling $AppID..." "Yellow" & $winget uninstall --id $AppID --silent --accept-source-agreements #Check if mods exist - Test-Mods $AppID + Test-ModsUninstall $AppID if ($ModsUninstall){ Write-Log "Modifications for $AppID during uninstall are being applied..." "Yellow" & "$ModsUninstall" From 0119072f515db3b634eda7af20f7b517dfe9c33b Mon Sep 17 00:00:00 2001 From: Romain <96626929+Romanitho@users.noreply.github.com> Date: Sat, 9 Apr 2022 17:36:08 +0200 Subject: [PATCH 2/3] Create README.md --- mods/README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 mods/README.md diff --git a/mods/README.md b/mods/README.md new file mode 100644 index 0000000..19ccd73 --- /dev/null +++ b/mods/README.md @@ -0,0 +1,4 @@ +# Winget-Install + +## Mods + From b0f352454ce5087a502fa10e02fc80aed87efa3d Mon Sep 17 00:00:00 2001 From: Romain <96626929+Romanitho@users.noreply.github.com> Date: Sat, 9 Apr 2022 17:59:28 +0200 Subject: [PATCH 3/3] fix functions --- winget-install.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winget-install.ps1 b/winget-install.ps1 index cc22c12..183f6d8 100644 --- a/winget-install.ps1 +++ b/winget-install.ps1 @@ -161,7 +161,7 @@ function Install-App ($AppID){ Write-Log "Installing $AppID..." "Yellow" & $winget install --id $AppID --silent --accept-package-agreements --accept-source-agreements #Check if mods exist - Test-ModsInstall $AppID + $ModsInstall = Test-ModsInstall $AppID if ($ModsInstall){ Write-Log "Modifications for $AppID during install are being applied..." "Yellow" & "$ModsInstall" @@ -188,7 +188,7 @@ function Uninstall-App ($AppID){ Write-Log "Uninstalling $AppID..." "Yellow" & $winget uninstall --id $AppID --silent --accept-source-agreements #Check if mods exist - Test-ModsUninstall $AppID + $ModsUninstall = Test-ModsUninstall $AppID if ($ModsUninstall){ Write-Log "Modifications for $AppID during uninstall are being applied..." "Yellow" & "$ModsUninstall"