spark-store-project/spark-store
14
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-store synced 2025-07-28 08:22:20 +08:00
Code Issues1 Packages Projects Releases Wiki Activity

修复在ACE中的判定条件，支持判定小小电脑

Browse Source
This commit is contained in:
shenmo 2025-06-12 00:32:19 +08:00
parent 01aa9bc281
commit 7c5745f7ce
2 changed files with 7 additions and 9 deletions

10
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 [选项] <deb路径>"
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)

6
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#*:}