mirror of
https://github.com/FEX-Emu/FEX.git
synced 2026-10-06 14:00:16 +02:00
Scripts: More changes to InstallFEX script
A dictionary lookup was only ever returning the .ero result since we were adding multiple values to the same key. Adds them as a list now and walks them. Additionally if we forget to add a new version again, have a fallback to try checking using our file format layout. Fixes an issue where a user running 23.10 was faulting the python script.
This commit is contained in:
1 parent
eb5cf1a667
commit
8f52d8e719
1 file changed
+12
-12
+12
-12
@@ -306,19 +306,19 @@ def GetRootFSPath():
|
||||
return _RootFSPath
|
||||
|
||||
def CheckRootFSInstallStatus():
|
||||
# Matches what is available on https://rootfs.fex-emu.gg/RootFS_links.json
|
||||
UbuntuVersionToRootFS = {
|
||||
"20.04": "Ubuntu_20_04.sqsh",
|
||||
"20.04": "Ubuntu_20_04.ero",
|
||||
"22.04": "Ubuntu_22_04.sqsh",
|
||||
"22.04": "Ubuntu_22_04.ero",
|
||||
"22.10": "Ubuntu_22_10.sqsh",
|
||||
"22.10": "Ubuntu_22_10.ero",
|
||||
"23.04": "Ubuntu_23_04.sqsh",
|
||||
"23.04": "Ubuntu_23_04.ero",
|
||||
}
|
||||
Distro = GetDistro()[1] # Extract Ubuntu version number, e.g. "23.10"
|
||||
|
||||
return os.path.exists(GetRootFSPath() + UbuntuVersionToRootFS[GetDistro()[1]])
|
||||
DistroUnderscore = Distro.replace(".", "_")
|
||||
Filename = "Ubuntu_{}.ero".format(DistroUnderscore)
|
||||
if os.path.exists(GetRootFSPath() + Filename):
|
||||
return True
|
||||
|
||||
Filename = "Ubuntu_{}.sqsh".format(DistroUnderscore)
|
||||
if os.path.exists(GetRootFSPath() + Filename):
|
||||
return True
|
||||
|
||||
# Couldn't find. Either no rootfs installed or unsupported distro.
|
||||
return False
|
||||
|
||||
def TryInstallRootFS():
|
||||
DidInstall = False
|
||||
|
||||
Reference in new issue
Block a user