Merge pull request #19 from the-project-group/main

Fixed Winget Path to also work for arm64 (replaced x64 with *)
FlorianSLZ · Aug 31, 2023 · 001f78b · 001f78b
2 parents 199a7e5 + 40c42c9
commit 001f78b
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 5 deletions.
diff --git a/source/.DS_Store b/source/.DS_Store
diff --git a/source/ressources/.DS_Store b/source/ressources/.DS_Store
diff --git a/source/ressources/template/.DS_Store b/source/ressources/template/.DS_Store
diff --git a/source/ressources/template/proactive remediations/detection-winget-upgrade.ps1 b/source/ressources/template/proactive remediations/detection-winget-upgrade.ps1
@@ -9,7 +9,7 @@ Param(
 )
 
 # resolve and navigate to winget
-$Path_WingetAll = Resolve-Path "C:\Program Files\WindowsApps\Microsoft.DesktopAppInstaller_*_x64__8wekyb3d8bbwe"
+$Path_WingetAll = Resolve-Path "C:\Program Files\WindowsApps\Microsoft.DesktopAppInstaller_*_*__8wekyb3d8bbwe"
 if($Path_WingetAll){$Path_Winget = $Path_WingetAll[-1].Path}
 cd $Path_Winget
 

diff --git a/source/ressources/template/proactive remediations/remediation-winget-upgrade.ps1 b/source/ressources/template/proactive remediations/remediation-winget-upgrade.ps1
@@ -10,7 +10,7 @@ Param(
 
 try{
     # resolve and navigate to winget
-    $Path_WingetAll = Resolve-Path "C:\Program Files\WindowsApps\Microsoft.DesktopAppInstaller_*_x64__8wekyb3d8bbwe"
+    $Path_WingetAll = Resolve-Path "C:\Program Files\WindowsApps\Microsoft.DesktopAppInstaller_*_*__8wekyb3d8bbwe"
     if($Path_WingetAll){$Path_Winget = $Path_WingetAll[-1].Path}
     cd $Path_Winget
 

diff --git a/source/ressources/template/winget/check.ps1 b/source/ressources/template/winget/check.ps1
@@ -1,7 +1,7 @@
 $ProgramName = "WINGETPROGRAMID"
 
 # resolve winget_exe
-$winget_exe = Resolve-Path "C:\Program Files\WindowsApps\Microsoft.DesktopAppInstaller_*_x64__8wekyb3d8bbwe\winget.exe"
+$winget_exe = Resolve-Path "C:\Program Files\WindowsApps\Microsoft.DesktopAppInstaller_*_*__8wekyb3d8bbwe\winget.exe"
 if ($winget_exe.count -gt 1){
         $winget_exe = $winget_exe[-1].Path
 }

diff --git a/source/ressources/template/winget/install.ps1 b/source/ressources/template/winget/install.ps1
@@ -10,7 +10,7 @@ $Path_local = "$Env:Programfiles\_MEM"
 Start-Transcript -Path "$Path_local\Log\$ProgramName-install.log" -Force -Append
 
 # resolve winget_exe
-$winget_exe = Resolve-Path "C:\Program Files\WindowsApps\Microsoft.DesktopAppInstaller_*_x64__8wekyb3d8bbwe\winget.exe"
+$winget_exe = Resolve-Path "C:\Program Files\WindowsApps\Microsoft.DesktopAppInstaller_*_*__8wekyb3d8bbwe\winget.exe"
 if ($winget_exe.count -gt 1){
         $winget_exe = $winget_exe[-1].Path
 }

diff --git a/source/ressources/template/winget/uninstall.ps1 b/source/ressources/template/winget/uninstall.ps1
@@ -3,7 +3,7 @@ $Path_local = "$Env:Programfiles\_MEM"
 Start-Transcript -Path "$Path_local\Log\uninstall\$ProgramName-uninstall.log" -Force -Append
 
 # resolve winget_exe
-$winget_exe = Resolve-Path "C:\Program Files\WindowsApps\Microsoft.DesktopAppInstaller_*_x64__8wekyb3d8bbwe\winget.exe"
+$winget_exe = Resolve-Path "C:\Program Files\WindowsApps\Microsoft.DesktopAppInstaller_*_*__8wekyb3d8bbwe\winget.exe"
 if ($winget_exe.count -gt 1){
         $winget_exe = $winget_exe[-1].Path
 }