新增ARM架构非飞腾CPU识别
This commit is contained in:
parent
83e34a983c
commit
3fbfb38a53
|
@ -3,9 +3,14 @@
|
||||||
cat /etc/deepin_version | grep 23
|
cat /etc/deepin_version | grep 23
|
||||||
if [[ $? != 0 ]]; then
|
if [[ $? != 0 ]]; then
|
||||||
# 如果不是
|
# 如果不是
|
||||||
|
# 判断系统是否有安装 aapt
|
||||||
|
which aapt > /dev/null
|
||||||
|
if [[ $? == 0 ]]; then
|
||||||
|
# 如果有安装
|
||||||
aapt "$@"
|
aapt "$@"
|
||||||
exit $?
|
exit $?
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
# 如果是
|
# 如果是
|
||||||
programPath=$(cd $(dirname $0); pwd)
|
programPath=$(cd $(dirname $0); pwd)
|
||||||
echo $programPath
|
echo $programPath
|
||||||
|
|
|
@ -25,8 +25,9 @@
|
||||||
"<b>V2.2.0:</b>",
|
"<b>V2.2.0:</b>",
|
||||||
"※1、支持 deepin 23,不需要强制依赖 aapt",
|
"※1、支持 deepin 23,不需要强制依赖 aapt",
|
||||||
"※2、修复 deepin 23 安装的 APK 无法正常在启动器显示图标的问题",
|
"※2、修复 deepin 23 安装的 APK 无法正常在启动器显示图标的问题",
|
||||||
"3、优化安装量统计机制",
|
"※3、新增 ARM 架构非飞腾 CPU 识别防止破坏鲲鹏 kbox 环境",
|
||||||
"4、关于窗口新增赞助页",
|
"4、优化安装量统计机制",
|
||||||
|
"5、关于窗口新增赞助页",
|
||||||
"",
|
"",
|
||||||
"<b>V2.1.2:</b>",
|
"<b>V2.1.2:</b>",
|
||||||
"※1、修复 https://gitee.com/gfdgd-xi/uengine-runner/issues/I6ZRZX",
|
"※1、修复 https://gitee.com/gfdgd-xi/uengine-runner/issues/I6ZRZX",
|
||||||
|
|
|
@ -1858,6 +1858,9 @@ def showhelp():
|
||||||
if not os.path.exists("/usr/bin/uengine"):
|
if not os.path.exists("/usr/bin/uengine"):
|
||||||
# Deepin/UOS 用户
|
# Deepin/UOS 用户
|
||||||
if "deepin" in SystemVersion.lower() or "uos" in SystemVersion.lower() or subprocess.getoutput("arch").replace("\n", "").replace(" ", "") != "x86_64":
|
if "deepin" in SystemVersion.lower() or "uos" in SystemVersion.lower() or subprocess.getoutput("arch").replace("\n", "").replace(" ", "") != "x86_64":
|
||||||
|
if not "ft-" in GetCommandReturn("lscpu").lower() and GetCommandReturn("lscpu").replace(" ", "").replace("\n", "") == "aarch64":
|
||||||
|
QtWidgets.QMessageBox.critical(None, "错误", "UEngine 运行器不支持非飞腾 CPU")
|
||||||
|
sys.exit(1)
|
||||||
if QtWidgets.QMessageBox.question(None, "提示", "您的电脑没有安装 UEngine,是否安装 UEngine 以便更好的使用\n安装完后重新启动该程序即可") == QtWidgets.QMessageBox.Yes:
|
if QtWidgets.QMessageBox.question(None, "提示", "您的电脑没有安装 UEngine,是否安装 UEngine 以便更好的使用\n安装完后重新启动该程序即可") == QtWidgets.QMessageBox.Yes:
|
||||||
OpenTerminal(f"pkexec apt install uengine -y")
|
OpenTerminal(f"pkexec apt install uengine -y")
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
|
|
|
@ -9,6 +9,6 @@ Maintainer: gfdgd xi <3025613752@qq.com>
|
||||||
Depends: python3, python3-tk, python3-pip, python3-setuptools, deepin-terminal | mate-terminal | gnome-terminal | xfce4-terminal, curl, python3-pil, python3-requests, adb, fonts-noto-cjk, python3-numpy, wget, inotify-tools, aria2, python3-pyqt5, python3-matplotlib, python3-urllib3, zenity, python3-pil.imagetk
|
Depends: python3, python3-tk, python3-pip, python3-setuptools, deepin-terminal | mate-terminal | gnome-terminal | xfce4-terminal, curl, python3-pil, python3-requests, adb, fonts-noto-cjk, python3-numpy, wget, inotify-tools, aria2, python3-pyqt5, python3-matplotlib, python3-urllib3, zenity, python3-pil.imagetk
|
||||||
Recommends: uengine, deepin-elf-verify, python3-pyqt5.qtwebengine, aapt
|
Recommends: uengine, deepin-elf-verify, python3-pyqt5.qtwebengine, aapt
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Conflicts: spark-uengine-apk-builder, com.gitee.uengine.runner.spark.ubuntu
|
Conflicts: spark-uengine-apk-builder, com.gitee.uengine.runner.spark.ubuntu, kbox
|
||||||
Homepage: https://gitee.com/gfdgd-xi/uengine-runner
|
Homepage: https://gitee.com/gfdgd-xi/uengine-runner
|
||||||
Description: 新版本Deepin/UOS发布后,可以在应用商店安装部分官方已适配的安卓应用,对爱好者来说,不能自己安装APK软件包始终差点意思,本程序可以为Deepin/UOS上的Uengine安卓运行环境安装/卸载/打包自定义APK软件包,并能发送安装的APK包启动菜单到桌面或系统菜单。
|
Description: 新版本Deepin/UOS发布后,可以在应用商店安装部分官方已适配的安卓应用,对爱好者来说,不能自己安装APK软件包始终差点意思,本程序可以为Deepin/UOS上的Uengine安卓运行环境安装/卸载/打包自定义APK软件包,并能发送安装的APK包启动菜单到桌面或系统菜单。
|
||||||
|
|
|
@ -13,6 +13,11 @@ else
|
||||||
echo "系统:$version"
|
echo "系统:$version"
|
||||||
if [ "$versionLower" = "deepin" ] || [ "$versionLower" = "uos" ]; then
|
if [ "$versionLower" = "deepin" ] || [ "$versionLower" = "uos" ]; then
|
||||||
echo "此系统为 Deepin/UOS,使用 apt 安装"
|
echo "此系统为 Deepin/UOS,使用 apt 安装"
|
||||||
|
lscpu | grep "FT-"
|
||||||
|
if [[ $? != 0 ]] && [[ `arch` == "aarch64" ]]; then
|
||||||
|
zenity --info --text="UEngine 运行器暂不支持非飞腾CPU"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
zenity --question --text="您还未安装 UEngine,是否现在安装?" --no-wrap
|
zenity --question --text="您还未安装 UEngine,是否现在安装?" --no-wrap
|
||||||
if [[ $? == 0 ]]; then
|
if [[ $? == 0 ]]; then
|
||||||
"$dir/launch.sh" deepin-terminal -C "pkexec apt install uengine -y"
|
"$dir/launch.sh" deepin-terminal -C "pkexec apt install uengine -y"
|
||||||
|
|
Loading…
Reference in New Issue