mirror of
https://gitee.com/gfdgd-xi/deep-wine-runner
synced 2025-01-12 17:48:27 +08:00
修复在安装exagear的情况下无法正常显示使用运行器带的运行库运行程序的问题
This commit is contained in:
parent
72208fd378
commit
5cb05e9956
@ -2242,8 +2242,8 @@ def CheckWine():
|
|||||||
canUseWine.append("基于 UOS box86 的 deepin-wine6-stable")
|
canUseWine.append("基于 UOS box86 的 deepin-wine6-stable")
|
||||||
if os.path.exists("/opt/exagear/bin/ubt_x64a64_al") and os.path.exists("/opt/deepin-wine6-stable/bin/wine"):
|
if os.path.exists("/opt/exagear/bin/ubt_x64a64_al") and os.path.exists("/opt/deepin-wine6-stable/bin/wine"):
|
||||||
canUseWine.append("基于 UOS exagear 的 deepin-wine6-stable")
|
canUseWine.append("基于 UOS exagear 的 deepin-wine6-stable")
|
||||||
if not os.system("which exagear") and os.path.exists("/opt/deepin-wine6-stable/bin/wine"):
|
#if not os.system("which exagear") and os.path.exists("/opt/deepin-wine6-stable/bin/wine"):
|
||||||
canUseWine.append("基于 exagear 的 deepin-wine6-stable")
|
#canUseWine.append("基于 exagear 的 deepin-wine6-stable")
|
||||||
for i in wine.keys():
|
for i in wine.keys():
|
||||||
if not os.system(f"which '{wine[i]}'"):
|
if not os.system(f"which '{wine[i]}'"):
|
||||||
canUseWine.append(i)
|
canUseWine.append(i)
|
||||||
@ -2391,13 +2391,9 @@ def CheckWine():
|
|||||||
wine[f"{k[0]}{chrootProgramPath}/wine/{i}/bin/wine-x86_64"] = f"{k[1]}{chrootProgramPath}/wine/{i}/bin/wine-x86_64"
|
wine[f"{k[0]}{chrootProgramPath}/wine/{i}/bin/wine-x86_64"] = f"{k[1]}{chrootProgramPath}/wine/{i}/bin/wine-x86_64"
|
||||||
canUseWine.append(f"{k[0]}{chrootProgramPath}/wine/{i}/bin/wine-x86_64")
|
canUseWine.append(f"{k[0]}{chrootProgramPath}/wine/{i}/bin/wine-x86_64")
|
||||||
untipsWine.append(f"{k[0]}{chrootProgramPath}/wine/{i}/bin/wine-x86_64")
|
untipsWine.append(f"{k[0]}{chrootProgramPath}/wine/{i}/bin/wine-x86_64")
|
||||||
for i in canUseWine[:]:
|
|
||||||
if os.path.exists(f"{programPath}/WineLib/usr/lib/ld-linux-x86-64.so.2"):
|
|
||||||
wine[f"使用运行器的运行库运行 {i}"] = f"bash '{programPath}/WineLib/run.sh' {wine[i]}"
|
|
||||||
canUseWine.append(f"使用运行器的运行库运行 {i}")
|
|
||||||
untipsWine.append(f"使用运行器的运行库运行 {i}")
|
|
||||||
except:
|
except:
|
||||||
pass
|
traceback.print_exc()
|
||||||
try:
|
try:
|
||||||
for i in os.listdir(f"{get_home()}/.deepinwine/"):
|
for i in os.listdir(f"{get_home()}/.deepinwine/"):
|
||||||
if os.path.exists(f"{get_home()}/.deepinwine/{i}/bin/wine"):
|
if os.path.exists(f"{get_home()}/.deepinwine/{i}/bin/wine"):
|
||||||
@ -2407,7 +2403,12 @@ def CheckWine():
|
|||||||
wine[f"{get_home()}/.deepinwine/{i}/bin/wine64"] = f"{get_home()}/.deepinwine/{i}/bin/wine64"
|
wine[f"{get_home()}/.deepinwine/{i}/bin/wine64"] = f"{get_home()}/.deepinwine/{i}/bin/wine64"
|
||||||
canUseWine.append(f"{get_home()}/.deepinwine/{i}/bin/wine64")
|
canUseWine.append(f"{get_home()}/.deepinwine/{i}/bin/wine64")
|
||||||
except:
|
except:
|
||||||
pass
|
traceback.print_exc()
|
||||||
|
for i in canUseWine[:]:
|
||||||
|
if os.path.exists(f"{programPath}/WineLib/usr/lib/ld-linux-x86-64.so.2"):
|
||||||
|
wine[f"使用运行器的运行库运行 {i}"] = f"bash '{programPath}/WineLib/run.sh' {wine[i]}"
|
||||||
|
canUseWine.append(f"使用运行器的运行库运行 {i}")
|
||||||
|
untipsWine.append(f"使用运行器的运行库运行 {i}")
|
||||||
except:
|
except:
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
app = QtWidgets.QApplication(sys.argv)
|
app = QtWidgets.QApplication(sys.argv)
|
||||||
|
Loading…
Reference in New Issue
Block a user