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

francedot · web-flow · commit ead6df2682f5 · 2024-09-28T23:04:48.000+02:00
Fix broken mirror and py alias
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": {

Original file line number	Diff line number	Diff line change
`@@ -53,11 +53,10 @@ if (-not $pythonExecutablePath) {`
`53`	`53`	`} else {`
`54`	`54`	`Write-Host "Installing Python for current user..."`
`55`	`55`	`Start-Process -FilePath $pythonInstallerFilePath -Args "/quiet InstallAllUsers=0 PrependPath=0" -NoNewWindow -Wait`
`56`		`- $pythonExecutablePath = Get-ChildItem -Path $userPythonPath -Filter python.exe -Recurse -ErrorAction SilentlyContinue \| Select-Object -First 1 -ExpandProperty FullName`
`57`		`-`
	`56`	`+ $pythonExecutablePath = "$userPythonPath\Python310\python.exe"`
`58`	`57`	$setAliasExpression = "Set-Alias -Name $pythonAlias -Value `"$pythonExecutablePath`""
`59`	`58`	`Add-Content -Path $PROFILE -Value $setAliasExpression`
`60`		`- Invoke-Expression $setAliasExpression`
	`59`	`+ Invoke-Expression $setAliasExpression`
`61`	`60`	`}`
`62`	`61`	`}`
`63`	`62`