diff --git a/deb-termux/DEBIAN/control b/deb-termux/DEBIAN/control index 2193823..f6be93d 100755 --- a/deb-termux/DEBIAN/control +++ b/deb-termux/DEBIAN/control @@ -24,11 +24,11 @@ Depends: python3, fakeroot, which, git, - xfwm4, - tigervnc, proot, bash Recommends: winbind, + tigervnc | termux-x11-nightly | termux-x11, + xfwm4, wimtools | wimlib, python3-pyquery, python3-pyqt5.qtwebengine | pyqtwebengine, diff --git a/deb-termux/DEBIAN/postinst b/deb-termux/DEBIAN/postinst index 7e0ddbb..d6f1683 100755 --- a/deb-termux/DEBIAN/postinst +++ b/deb-termux/DEBIAN/postinst @@ -108,7 +108,10 @@ fi # 设置目录权限,让用户可读可写,方便后续删除组件 chmod 777 -R /opt/apps/deepin-wine-runner > /dev/null 2>&1 | true -if [[ ! -f /data/data/com.termux/files/home/.vnc/passwd ]]; then +# 向服务器返回安装数加1(不显示内容且忽略错误) +python3 /opt/apps/deepin-wine-runner/Download.py $version > /dev/null 2>&1 | true + +if [[ ! -f /data/data/com.termux/files/home/.vnc/passwd ]] && [[ -f /data/data/com.termux/files/usr/bin/vncpasswd ]]; then echo 开始配置 VNCServer echo 接下来需要设置 VNCServer 的密码 set +e @@ -121,11 +124,11 @@ if [[ ! -f /data/data/com.termux/files/home/.vnc/passwd ]]; then echo 设置有误,需重新设置 sleep 1 done + echo 'Wine 运行器安装完成,如果没有设置 $DISPLAY 变量的情况下打开 Wine 运行器' + echo '可以在浏览器输入网址 http://localhost:6080/vnc.html 远程访问' + echo '或者用 VNC 远程工具输入 localhost:5 远程访问' + fi -# 向服务器返回安装数加1(不显示内容且忽略错误) -python3 /opt/apps/deepin-wine-runner/Download.py $version > /dev/null 2>&1 | true -echo 'Wine 运行器安装完成,如果没有设置 $DISPLAY 变量的情况下打开 Wine 运行器' -echo '可以在浏览器输入网址 http://localhost:6080/vnc.html 远程访问' -echo '或者用 VNC 远程工具输入 localhost:5 远程访问' + diff --git a/mainwindow-termux-loader.sh b/mainwindow-termux-loader.sh index a9f2cf7..79c96fc 100755 --- a/mainwindow-termux-loader.sh +++ b/mainwindow-termux-loader.sh @@ -9,7 +9,7 @@ if [[ -f $HOME/.config/deepin-wine-runner/vnc-public ]]; then unset noVNCOption unset VNCServerOption fi -if [[ $DISPLAY == "" ]] && [[ $WAYLAND_DISPLAY == "" ]]; then +if [[ $DISPLAY == "" ]] && [[ $WAYLAND_DISPLAY == "" ]] && [[ -f /data/data/com.termux/files/usr/bin/vncpasswd ]]; then # 自动配置 NoVNC export DISPLAY=:5 vncserver -kill :5 diff --git a/wine/installwine b/wine/installwine index 532996b..ae3e0c6 100755 --- a/wine/installwine +++ b/wine/installwine @@ -230,7 +230,29 @@ class GetInfo(): "/usr/lib/mips64el-linux-gnuabi64/ld.so.1", "/usr/lib/powerpc64le-linux-gnu/ld64.so.2", "/usr/lib/loongarch64-linux-gnu/ld-linux-loongarch-lp64d.so.1", - "/usr/lib/loongarch64-linux-gnu/ld.so.1" + "/usr/lib/loongarch64-linux-gnu/ld.so.1", + "/usr/lib/ld-linux.so.2", + "/usr/lib/ld-linux-x86-64.so.2", + "/usr/lib/ld-linux-armhf.so.3", + "/usr/lib/ld-linux.so.3", + "/usr/lib/ld-linux-aarch64.so.1", + "/usr/lib/ld-linux-aarch64.so.1", + "/usr/lib/ld-linux-riscv64-lp64d.so.1", + "/usr/lib/ld.so.1", + "/usr/lib/ld64.so.2", + "/usr/lib/ld-linux-loongarch-lp64d.so.1", + "/usr/lib64/ld.so.1", + "/usr/lib64/ld-linux.so.2", + "/usr/lib64/ld-linux-x86-64.so.2", + "/usr/lib64/ld-linux-armhf.so.3", + "/usr/lib64/ld-linux.so.3", + "/usr/lib64/ld-linux-aarch64.so.1", + "/usr/lib64/ld-linux-aarch64.so.1", + "/usr/lib64/ld-linux-riscv64-lp64d.so.1", + "/usr/lib64/ld.so.1", + "/usr/lib64/ld64.so.2", + "/usr/lib64/ld-linux-loongarch-lp64d.so.1", + "/usr/lib64/ld.so.1" ] for i in glibcPathList: if (os.path.exists(i)): @@ -251,6 +273,8 @@ class GetInfo(): newestVersion = i version = newestVersion self.glibcVersion = version + if (version == None): + version = "2.28" # 默认值 return version def compareVersion(self, version1: str, version2: str):