Merge pull request #11 from Romanitho/Mod

Minor changes on Mod functions
Romanitho · Apr 9, 2022 · c3da0be · c3da0be
2 parents 6a7c0ac + f6506f5
commit c3da0be
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/mods/README.md b/mods/README.md
@@ -0,0 +1,4 @@
+# Winget-Install
+
+## Mods
+
diff --git 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
+        $ModsInstall = 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
+        $ModsUninstall = Test-ModsUninstall $AppID
         if ($ModsUninstall){
             Write-Log "Modifications for $AppID during uninstall are being applied..." "Yellow"
             & "$ModsUninstall"