From 72e3d54f8d8e92e272aa6a04d5f193b270b5eb0b Mon Sep 17 00:00:00 2001 From: shenmo Date: Thu, 12 Jun 2025 00:32:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8ACE=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=88=A4=E5=AE=9A=E6=9D=A1=E4=BB=B6=EF=BC=8C=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=88=A4=E5=AE=9A=E5=B0=8F=E5=B0=8F=E7=94=B5=E8=84=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tool/ssaudit | 10 ++++------ tool/ssinstall | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tool/ssaudit b/tool/ssaudit index 94f61e9..02b44ae 100755 --- a/tool/ssaudit +++ b/tool/ssaudit @@ -66,7 +66,7 @@ case $(arch) in esac # 帮助函数 function show_help() { - echo "Spark Store audit script. 星火商店审核脚本" + echo "Spark Store Audit script. 星火商店审核脚本" echo "用法: $0 [选项] " echo "选项:" echo " -h, --help 显示帮助信息" @@ -279,8 +279,8 @@ function install_in_ace_env() { local deb_path="$2" local ace_env_pkg="${3#*:}" - if [ "$IS_ACE_ENV" != "" ]; then - echo "无法在ACE中安装ACE包" + if [ "$IS_ACE_ENV" != "" ] || command -v termux-chroot; then + echo "无法在ACE/termux/小小电脑中安装ACE包" return 1 fi if ! ensure_ace_env "$ace_env_pkg"; then @@ -345,7 +345,7 @@ function auto_try_install() { fi # 如果主机安装失败,并非在ACE内运行且不在强制本地模式,尝试ACE环境 - if [ "$FORCE_NATIVE" -eq 0 ] || [ "$IS_ACE_ENV" = "" ]; then + if [ "$FORCE_NATIVE" -eq 0 ] && [ "$IS_ACE_ENV" = "" ] && ! command -v termux-chroot; then for ace_entry in "${ACE_ENVIRONMENTS_FOR_AUTOINSTALL[@]}"; do local ace_cmd=${ace_entry%%:*} local ace_env_pkg=${ace_entry#*:} @@ -444,8 +444,6 @@ function main_install() { DEBPATH=$(realpath "$DEBPATH") lock_file "$DEBPATH" -# hash_check "$DEBPATH" - package_name=$(dpkg-deb -f "$DEBPATH" Package) diff --git a/tool/ssinstall b/tool/ssinstall index 6e0bed9..c2fec21 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -279,8 +279,8 @@ function install_in_ace_env() { local deb_path="$2" local ace_env_pkg="${3#*:}" - if [ "$IS_ACE_ENV" != "" ]; then - echo "无法在ACE中安装ACE包" + if [ "$IS_ACE_ENV" != "" ] || command -v termux-chroot; then + echo "无法在ACE/termux/小小电脑中安装ACE包" return 1 fi if ! ensure_ace_env "$ace_env_pkg"; then @@ -345,7 +345,7 @@ function auto_try_install() { fi # 如果主机安装失败,并非在ACE内运行且不在强制本地模式,尝试ACE环境 - if [ "$FORCE_NATIVE" -eq 0 ] || [ "$IS_ACE_ENV" = "" ]; then + if [ "$FORCE_NATIVE" -eq 0 ] && [ "$IS_ACE_ENV" = "" ] && ! command -v termux-chroot; then for ace_entry in "${ACE_ENVIRONMENTS_FOR_AUTOINSTALL[@]}"; do local ace_cmd=${ace_entry%%:*} local ace_env_pkg=${ace_entry#*:}