Merge pull request #24 from microsoft/users/fbonacci/fix-office-mirror

Fix broken mirror and py alias
microsoft · Sep 28, 2024 · ead6df2 · ead6df2
2 parents d1c5796 + b09733a
commit ead6df2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/win-arena-container/vm/setup/setup.ps1 b/src/win-arena-container/vm/setup/setup.ps1
@@ -53,11 +53,10 @@ if (-not $pythonExecutablePath) {
     } else {
         Write-Host "Installing Python for current user..."
         Start-Process -FilePath $pythonInstallerFilePath -Args "/quiet InstallAllUsers=0 PrependPath=0" -NoNewWindow -Wait
-        $pythonExecutablePath = Get-ChildItem -Path $userPythonPath -Filter python.exe -Recurse -ErrorAction SilentlyContinue | Select-Object -First 1 -ExpandProperty FullName
-
+        $pythonExecutablePath = "$userPythonPath\Python310\python.exe"
         $setAliasExpression = "Set-Alias -Name $pythonAlias -Value `"$pythonExecutablePath`""
         Add-Content -Path $PROFILE -Value $setAliasExpression
-        Invoke-Expression $setAliasExpression    
+        Invoke-Expression $setAliasExpression
     }
 }
 

diff --git a/src/win-arena-container/vm/setup/tools_config.json b/src/win-arena-container/vm/setup/tools_config.json
@@ -28,9 +28,9 @@
     },
     "LibreOffice": {
         "mirrors": [
-            "https://mirrors.iu13.net/tdf/libreoffice/stable/24.2.5/win/x86_64/LibreOffice_24.2.5_Win_x86-64.msi",
-            "https://download.documentfoundation.org/libreoffice/stable/24.2.5/win/x86_64/LibreOffice_24.2.5_Win_x86-64.msi",
-            "https://mirror.raiolanetworks.com/tdf/libreoffice/_testing_/24.2.5/win/x86_64/LibreOffice_24.2.5.2_Win_x86-64.msi"
+            "https://mirror.raiolanetworks.com/tdf/libreoffice/stable/24.8.2/win/x86_64/LibreOffice_24.8.2_Win_x86-64.msi",
+            "https://mirrors.iu13.net/tdf/libreoffice/stable/24.8.2/win/x86_64/LibreOffice_24.8.2_Win_x86-64.msi",
+            "https://download.documentfoundation.org/libreoffice/stable/24.8.2/win/x86_64/LibreOffice_24.8.2_Win_x86-64.msi"
         ]
     },
     "VLC": {