From f80333d14b5d588db4c8cf04af8620872c167f82 Mon Sep 17 00:00:00 2001
From: JonatanRek <gamerclassn7@gmail.com>
Date: Fri, 14 Feb 2025 09:28:03 +0100
Subject: [PATCH] Fixes to FG Install

---
 apps/FortigateVPN/{chectk.ps1 => check.ps1} |  0
 apps/FortigateVPN/config/vpnSettings.reg    |  6 +++---
 apps/FortigateVPN/install.ps1               |  4 ++--
 apps/FortigateVPN/uninstall.ps1             | 10 ++++++++++
 build.ps1                                   |  1 +
 5 files changed, 16 insertions(+), 5 deletions(-)
 rename apps/FortigateVPN/{chectk.ps1 => check.ps1} (100%)

diff --git a/apps/FortigateVPN/chectk.ps1 b/apps/FortigateVPN/check.ps1
similarity index 100%
rename from apps/FortigateVPN/chectk.ps1
rename to apps/FortigateVPN/check.ps1
diff --git a/apps/FortigateVPN/config/vpnSettings.reg b/apps/FortigateVPN/config/vpnSettings.reg
index 4ebfb9b..3f31b4a 100644
--- a/apps/FortigateVPN/config/vpnSettings.reg
+++ b/apps/FortigateVPN/config/vpnSettings.reg
@@ -1,4 +1,4 @@
-Windows Registry Editor Version 5.00
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Fortinet\FortiClient\Sslvpn] 
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Fortinet\FortiClient\Sslvpn] 
 "WinDnsCacheService"=dword:00000002
\ No newline at end of file
diff --git a/apps/FortigateVPN/install.ps1 b/apps/FortigateVPN/install.ps1
index 275b99a..bb49013 100644
--- a/apps/FortigateVPN/install.ps1
+++ b/apps/FortigateVPN/install.ps1
@@ -4,12 +4,12 @@ $installerName = "FortiClient_v7.4.0.1658.msi"
 Start-Transcript -Path "$PathIntune\Log\FortigateVPN-install.log" -Force
 
 $installerPath = ('./bin/' + $installerName)
-$installArgs = "/install","/quiet","/norestart"
+$installArgs = "/quiet","/norestart"
 Start-Process -FilePath $installerPath -ArgumentList "$installArgs" -Wait
 Write-Host ("Fortigate VPN Installed versions installed: " + $installerName)
 
 foreach ($folder in (Get-ChildItem -Path ("{0}/config/"  -f $PSScriptRoot) -Filter "vpn*.reg")) {
-    $process = Start-Process -Path reg.exe -ArgumentList @("Import", $folder.FullName) -Wait -PassThru
+    $process = Start-Process -FilePath reg.exe -ArgumentList @("Import", $folder.FullName) -Wait -PassThru
     If($process.ExitCode)
     {
         Write-Host ("Profile [{0}] Imported" -f $folder.Name)
diff --git a/apps/FortigateVPN/uninstall.ps1 b/apps/FortigateVPN/uninstall.ps1
index e69de29..e71f08d 100644
--- a/apps/FortigateVPN/uninstall.ps1
+++ b/apps/FortigateVPN/uninstall.ps1
@@ -0,0 +1,10 @@
+# array of uninstall args
+$uninstallArgs = "/uninstall"," ","/quiet", "/norestart"
+$dotnetVersions = Get-WmiObject -Class Win32_Product | Where-Object { $_.Name -eq "FortiClient VPN*" }
+
+foreach ($version in $dotnetVersions) {
+    # update array index 1 with version id
+    $uninstallArgs[1] = '"' + $version.IdentifyingNumber + '"'
+    Write-Host "Uninstalling $($version.Name) ($($version.Version))... $("$uninstallArgs")"
+    Start-Process -FilePath "msiexec.exe" -ArgumentList "$uninstallArgs" -Wait
+}
\ No newline at end of file
diff --git a/build.ps1 b/build.ps1
index c802f47..643f433 100644
--- a/build.ps1
+++ b/build.ps1
@@ -17,6 +17,7 @@ foreach ($folder in (Get-ChildItem -Path "./apps/" )) {
         }
     }
 
+    Remove-Item -Path ("./build/{0}.intunewin" -f $folder.Name) -Force
     $buildArgs = "-c", $folder.FullName, "-s", $sourceFile.FullName, "-o", "./build/", "-q"
     Start-Process -FilePath ('./v{0}/Microsoft-Win32-Content-Prep-Tool-{0}/IntuneWinAppUtil.exe' -f $version) -ArgumentList "$buildArgs" -Wait
     Move-Item -Path ("./build/{0}.intunewin" -f ($sourceFile.Name -split "\.")[0]) -Destination ("./build/{0}.intunewin" -f $folder.Name)