gfdgd-xi/deep-wine-runner
gfdgd-xi/deep-wine-runner
1
0
Fork 0
mirror of https://gitee.com/gfdgd-xi/deep-wine-runner synced 2025-01-13 01:58:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化运行库显示方式

Browse Source
This commit is contained in:
gfdgd xi 2023-07-11 15:08:28 +08:00
parent 6c43ce51b4
commit f63cdff0aa
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
WineLib/run.sh
View File

@ -1,12 +1,16 @@
#!/bin/bash #!/bin/bash
CURRENT_DIR=$(cd $(dirname $0); pwd) CURRENT_DIR=$(cd $(dirname $0); pwd)
if [[ ! -d "$CURRENT_DIR/usr" ]]; then
zenity --info --text=未安装运行库，无法运行 --no-wrap
exit
fi
if [[ ! -d /lib64 ]]; then if [[ ! -d /lib64 ]]; then
pkexec mkdir /lib64 -p pkexec mkdir /lib64 -p
fi fi
bwrap --dev-bind / / \ bwrap --dev-bind / / \
--ro-bind $CURRENT_DIR/lib /lib \ --ro-bind "$CURRENT_DIR/lib" /lib \
--ro-bind $CURRENT_DIR/lib64 /lib \ --ro-bind "$CURRENT_DIR/lib64" /lib \
--ro-bind $CURRENT_DIR/usr /usr \ --ro-bind "$CURRENT_DIR/usr" /usr \
--ro-bind /usr/share /usr/share \ --ro-bind /usr/share /usr/share \
--ro-bind /usr/bin /usr/bin \ --ro-bind /usr/bin /usr/bin \
--ro-bind /usr/sbin /usr/sbin \ --ro-bind /usr/sbin /usr/sbin \

15
mainwindow.py
View File

@ -2358,13 +2358,6 @@ def CheckWine():
"/opt/exagear/bin/ubt_x32a64_al -- " "/opt/exagear/bin/ubt_x32a64_al -- "
] ]
) )
if os.path.exists(f"{programPath}/WineLib/usr/lib/ld-linux-x86-64.so.2"):
nameValue.append(
[
"使用运行器的运行库运行",
f"bash '{programPath}/WineLib/run.sh' "
]
)
for g in qemuBottleList: for g in qemuBottleList:
nameValue.append([ nameValue.append([
f"使用qemu-{g[0]}-static 调用容器{g[1]}运行 ", f"使用qemu-{g[0]}-static 调用容器{g[1]}运行 ",
@ -2398,6 +2391,11 @@ 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 not 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 pass
try: try:
@ -2676,7 +2674,8 @@ mainLayout.setColumnStretch(1, 1)
mainLayout.addWidget(returnText, 0, 1, 2, 1) mainLayout.addWidget(returnText, 0, 1, 2, 1)
# 版权 # 版权
copy = QtWidgets.QLabel(f"""\n程序版本：{version}，<b>提示：Wine 无法保证可以运行所有的 Windows 程序，如果想要运行更多 Windows 程序，可以考虑虚拟机和双系统</b><br> copy = QtWidgets.QLabel(f"""程序版本：{version}，<b>提示：Wine 无法保证可以运行所有的 Windows 程序，如果想要运行更多 Windows 程序，可以考虑虚拟机和双系统</b><br/>
<b>注：部分二进制兼容层会自动添加 binfmt-support（如原版的 Box86/64、Qemu User Static），则无需在 Wine 版本那里特别指定兼容层，直接指定 Wine 即可</b><br/>
©2020~{time.strftime("%Y")} gfdgd xi""") ©2020~{time.strftime("%Y")} gfdgd xi""")
mainLayout.addWidget(copy, 2, 0, 1, 1) mainLayout.addWidget(copy, 2, 0, 1, 1)