Merge pull request #3689 from catfella/fix_ppa_detection

Scripts/InstallFEX: update PPA URL
FEX-Emu · Jun 14, 2024 · 9744d8d · 9744d8d
2 parents aa0f2c3 + f3e6ecb
commit 9744d8d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Scripts/InstallFEX.py b/Scripts/InstallFEX.py
@@ -3,6 +3,7 @@
 import subprocess
 import sys
 import tempfile
+import re
 
 _Arch = None
 def GetArch():
@@ -131,7 +132,7 @@ def GetCPUFeaturesVersion():
     return _ArchVersion
 
 _PPAInstalled = None
-FEXPPA = "http://ppa.launchpad.net/fex-emu/fex/ubuntu"
+FEXPPA_REGEX = r".*\/fex-emu\/fex\/ubuntu$"
 
 def GetPPAStatus():
     global _PPAInstalled
@@ -147,7 +148,7 @@ def GetPPAStatus():
                 LineSplit = Line.split(" ")
 
                 # 'status' 'URL' 'series' 'arch' 'type'
-                if LineSplit[1] == FEXPPA:
+                if re.match(FEXPPA_REGEX, LineSplit[1]):
                     _PPAInstalled = True
                     break