进一步适配ACE

tool/ssaudit

@@ -1,6 +1,8 @@
 #!/bin/bash
-
+SPARK_DOWNLOAD_SERVER_URL="https://d.spark-app.store/"
+SPARK_DOWNLOAD_SERVER_URL_NO_PROTOCOL="d.spark-app.store"
 source /opt/durapps/spark-store/bin/bashimport/transhell.amber
+
 load_transhell_debug
 export DEBIAN_FRONTEND=noninteractive
 
@@ -60,30 +62,8 @@ function zenity() {
 }
 
 function hash_check() {
-    if [ ! -e "/var/lib/aptss/lists/d.spark-app.store_${STORE_URL}_Packages" ] && \
-       [ ! -e "/var/lib/aptss/lists/d.store.deepinos.org.cn_${STORE_URL}_Packages" ] && \
-       [ ! -e "/var/lib/aptss/lists/mirrors.sdu.edu.cn_spark-store_${STORE_URL}_Packages" ]; then
-        echo "接收星火仓库软件信息中..."
-        aptss ssupdate
-    fi
 
-    if [ -e "/var/lib/aptss/lists/d.spark-app.store_${STORE_URL}_Packages" ]; then
+    IS_SHA512SUM_CHECKED=skipped
-        PACKAGES_DATA_PATH="/var/lib/aptss/lists/d.spark-app.store_${STORE_URL}_Packages"
-        echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH，是星火域名仓库配置"
-    elif [ -e "/var/lib/aptss/lists/d.store.deepinos.org.cn_${STORE_URL}_Packages" ]; then
-        PACKAGES_DATA_PATH="/var/lib/aptss/lists/d.store.deepinos.org.cn_${STORE_URL}_Packages"
-        echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH，是d域名单目录仓库配置"
-    else
-        PACKAGES_DATA_PATH="/var/lib/aptss/lists/mirrors.sdu.edu.cn_spark-store-repository_${STORE_URL}_Packages"
-        echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH，是SDU镜像仓库配置"
-    fi
-
-    echo "正在运行包验证..."
-    echo "Running Spark Package Verify..."
-
-    DEB_SHA512SUM=$(sha512sum "$1" | cut -d ' ' -f 1)
-    unset IS_SHA512SUM_CHECKED
-    IS_SHA512SUM_CHECKED=$(cat "$PACKAGES_DATA_PATH" | grep "$DEB_SHA512SUM")
 }
 
 function lock_file(){
@@ -161,7 +141,9 @@ fi
 
 lock_file "$DEBPATH"
 
-IS_SHA512SUM_CHECKED=skipped
+hash_check "$DEBPATH"
+
+
 
 if [ ! -z "$IS_SHA512SUM_CHECKED" ]; then
     echo "校验跳过，开始安装"
@@ -242,7 +224,7 @@ if [ "$try_run_ret" -ne 0 ]; then ## 若安装检测仍然失败
         exit "$try_run_ret"
     fi
 else ## 如果主机安装检测成功
-    dpkg -i "$DEBPATH" || aptss install "$DEBPATH" -yfq 
+    dpkg -i "$DEBPATH" || aptss install "$DEBPATH" -yfq
 fi
 
 ### 退出阶段保持不变 ###

tool/store-helper/check-is-installed

@@ -1,10 +1,42 @@
 #!/bin/bash
-dpkg -l | grep "^ii  $1 " > /dev/null
+dpkg -s "$1" > /dev/null
 RET="$?"
-if [[ "$RET" != "0" ]] && command -v bookworm-run > /dev/null;then
+    if [[ "$RET" != "0" ]] &&[[ "$IS_ACE_ENV" == "" ]];then ## 如果未在ACE环境中
-    echo "Try ACE Bookworm"
+        # 定义按顺序尝试的ACE环境（命令:推荐安装包）
-    bookworm-run dpkg -l | grep "^ii  $1 " > /dev/null
+        declare -a ace_commands_order=(
-    RET="$?"
+            "bookworm-run:amber-ce-bookworm"
-    exit "$RET"
+            "trixie-run:amber-ce-trixie"
-fi
+            "deepin23-run:amber-ce-deepin23"
+        )
+for ace_entry in "${ace_commands_order[@]}"; do
+            ace_cmd=${ace_entry%%:*}
+            if command -v "$ace_cmd" >/dev/null 2>&1; then
+                echo "----------------------------------------"
+                echo "正在检查 $ace_cmd 环境的安装..."
+                echo "----------------------------------------"
+                
+                # 在ACE环境中执行安装检测
+                $ace_cmd dpkg -l | grep "^ii  $1 " > /dev/null
+                try_run_ret="$?"
+                
+
+                # 最终检测结果处理
+                if [ "$try_run_ret" -eq 0 ]; then
+                    echo "----------------------------------------"
+                    echo "在 $ace_cmd 环境中找到了安装"
+                    echo "----------------------------------------"
+                    exit $try_run_ret
+                else
+                    echo "----------------------------------------"
+                    echo "在 $ace_cmd 环境中未能找到安装，继续查找"
+                    echo "----------------------------------------"
+                fi
+            fi
+        done
+                    echo "----------------------------------------"
+                    echo "所有已安装的 ACE 环境中未能找到安装，退出"
+                    echo "----------------------------------------"
+                    exit "$RET"
+     fi
+## 如果在ACE环境中或者未出错
 exit "$RET"

tool/store-helper/ss-launcher

@@ -1,142 +1,132 @@
 #!/bin/bash
-# ===== Log =====
-# log.info xxx
-# log.warn xxx
-# log.info xxx
-# log.debug xxx
-# 带颜色的echo
-function log.color_output() {
-    local color=$1
-    shift 1
 
-    echo >&2 -e "\033[${color}m$@\033[0m"
+# ===== ACE环境配置 =====
-    return 0
+declare -a ace_commands_order=(
+    "bookworm-run:amber-ce-bookworm"
+    "trixie-run:amber-ce-trixie"
+    "deepin23-run:amber-ce-deepin23"
+)
+
+# ===== 日志和函数 =====
+[ -f /opt/durapps/spark-store/bin/bashimport/log.amber ] && \
+    source /opt/durapps/spark-store/bin/bashimport/log.amber || {
+    log.info() { echo "INFO: $*"; }
+    log.warn() { echo "WARN: $*"; }
+    log.error() { echo "ERROR: $*"; }
+    log.debug() { echo "DEBUG: $*"; }
 }
 
-# Log is named without prefix "utils." for convenience
+# ===== 功能函数 =====
-# Usage: log.log <level> ...content
+function scan_desktop_file_log() {
-function log.log() {
-    if [[ $# < 2 ]]; then
-        return -1
-    fi
-
-    local level=$1
-    shift 1
-
-    case $level in
-    error) log.color_output "0;31" "[ERROR] $@" ;;
-    warn) log.color_output "1;33" "[WARN] $@" ;;
-    info) log.color_output "1;37" "[INFO] $@" ;;
-    debug) log.color_output "1;30" "[DEBUG] $@" ;;
-    esac
-
-    return 0
-}
-
-function log.error() { log.log "error" "$@"; }
-function log.warn() { log.log "warn" $@; }
-function log.info() { log.log "info" $@; }
-function log.debug() { log.log "debug" $@; }
-
-
-function scan_desktop_file_log(){
-unset desktop_file_path
-package_name=$1
-    for desktop_file_path in $(dpkg -L "$1" |grep /usr/share/applications/ | awk '/\.desktop$/ {print}'); do
-	if [ "$(cat $desktop_file_path | grep NoDisplay=true)" = "" ];then
-	log.info "$desktop_file_path is found."
-	fi
-    done
-	for desktop_file_path in $(dpkg -L "$1" |grep /opt/apps/$package_name/entries/applications/ | awk '/\.desktop$/ {print}'); do
-	if [ "$(cat $desktop_file_path | grep NoDisplay=true)" = "" ];then
-	log.info "$desktop_file_path is found."
-	fi
-    done
-
-
-}
-
-function scan_desktop_file(){
     unset desktop_file_path
-    local result=""
+    local package_name=$1
-    for desktop_file_path in $(dpkg -L "$1" | grep /usr/share/applications/ | awk '/\.desktop$/ {print}'); do
+    # 标准desktop文件检测
-        if [ "$(grep NoDisplay=true $desktop_file_path)" = "" ]; then
+    while IFS= read -r path; do
-            result+="$desktop_file_path,"
+        [ -z "$(grep 'NoDisplay=true' "$path")" ] && {
-        fi
+            log.info "Found valid desktop file: $path"
-    done
+            desktop_file_path="$path"
-    for desktop_file_path in $(dpkg -L "$1" | grep /opt/apps/$package_name/entries/applications | awk '/\.desktop$/ {print}'); do
+            return 0
-        if [ "$(grep NoDisplay=true $desktop_file_path)" = "" ]; then
+        }
-            result+="$desktop_file_path,"
+    done < <(dpkg -L "$package_name" 2>/dev/null | grep -E '/usr/share/applications/.*\.desktop$|/opt/apps/.*/entries/applications/.*\.desktop$')
-        fi
+
-    done
+    # 深度环境特殊处理
-    # 去掉最后一个逗号
+    while IFS= read -r path; do
-    if [ -n "$result" ]; then
+        [ -z "$(grep 'NoDisplay=true' "$path")" ] && {
-        result=${result%,}
+            log.info "Found deepin desktop file: $path"
-    fi
+            desktop_file_path="$path"
-    echo "$result"
+            return 0
+        }
+    done < <(find /opt/apps/$package_name -path '*/entries/applications/*.desktop' 2>/dev/null)
+    return 1
 }
 
-function launch_app(){
+function scan_desktop_file() {
+    local package_name=$1 result=""
+    # 标准结果收集
+    while IFS= read -r path; do
+        [ -z "$(grep 'NoDisplay=true' "$path")" ] && result+="$path,"
+    done < <(dpkg -L "$package_name" 2>/dev/null | grep -E '/usr/share/applications/.*\.desktop$|/opt/apps/.*/entries/applications/.*\.desktop$')
+    
+    # 深度环境补充扫描
+    while IFS= read -r path; do
+        [ -z "$(grep 'NoDisplay=true' "$path")" ] && result+="$path,"
+    done < <(find /opt/apps/$package_name -path '*/entries/applications/*.desktop' 2>/dev/null)
+    
+    echo "${result%,}"
+}
 
-    # 检查是否传入了路径参数
+function launch_app() {
-    if [ -z "$1" ]; then
+    local DESKTOP_FILE_PATH="${1#file://}"
-        log.error "请传入文件路径作为参数"
+    # 提取并净化Exec命令
+    exec_command=$(grep -m1 '^Exec=' "$DESKTOP_FILE_PATH" | cut -d= -f2- | sed 's/%.//g')
+    [ -z "$exec_command" ] && return 1
+    log.info "Launching: $exec_command"
+    # 图形环境启动优化
+    if [ -n "$DISPLAY" ]; then
+        nohup env DISPLAY=$DISPLAY XAUTHORITY=${XAUTHORITY:-~/.Xauthority} ${SHELL:-bash} -c "$exec_command" >/dev/null 2>&1 &
+    else
+        nohup ${SHELL:-bash} -c "$exec_command" >/dev/null 2>&1 &
+    fi
+}
+
+# ===== ACE环境执行器 =====
+function ace_runner() {
+    local command_type=$1 package_name=$2
+    for ace_entry in "${ace_commands_order[@]}"; do
+        local ace_cmd=${ace_entry%%:*}
+        command -v "$ace_cmd" >/dev/null || continue
+        
+        log.info "Checking in $ace_cmd environment..."
+        if output=$($ace_cmd "$0" "$command_type" "$package_name" 2>/dev/null); then
+            [ "$command_type" = "list" ] && echo "$output"
+            exit 0
+        fi
+    done
+    return 1
+}
+
+# ===== 主逻辑 =====
+[ $# -lt 2 ] && {
+    log.error "Usage: $0 {check|launch|list|start} package_name/desktop_file"
+    exit 1
+}
+
+case $1 in
+check)
+    # 当前环境检查
+    if scan_desktop_file_log "$2"; then
+        exit 0
+    else
+        # 非ACE环境下执行ACE环境扫描
+        [ -z "$IS_ACE_ENV" ] && ace_runner check "$2"
         exit 1
     fi
+    ;;
 
-    DESKTOP_FILE_PATH=$1
+list)
-
+    # 当前环境列表
-    if [[ $DESKTOP_FILE_PATH == file://* ]]; then
+    if result=$(scan_desktop_file "$2"); then
-        # 如果是，移除 'file://' 部分并输出结果
+        echo "$result"
-        DESKTOP_FILE_PATH="${DESKTOP_FILE_PATH#file://}"
+        exit 0
+    else
+        # 非ACE环境下执行ACE环境扫描
+        [ -z "$IS_ACE_ENV" ] && ace_runner list "$2"
+        exit 1
     fi
+    ;;
 
-    # 获取文件内容中第一个 Exec= 后的命令
+launch|start)
-    exec_command=$(grep -m 1 -oP "(?<=Exec=).*" "$DESKTOP_FILE_PATH")
+    # 当前环境启动
-
+    if scan_desktop_file_log "$2" && launch_app "$desktop_file_path"; then
-    # 删除 exec_command 中最后的 % 及其后面的内容
+        exit 0
-    exec_command="${exec_command%\%*}"
+    else
-
+        # 非ACE环境下通过ACE环境启动
-    # 打印提取的命令
+        [ -z "$IS_ACE_ENV" ] && ace_runner launch "$2"
-    log.info "Command is $exec_command"
+        exit 1
-
+    fi
-    # 在默认终端执行命令
+    ;;
-    bash -c "$exec_command"
+*)
-}
+    log.error "Invalid command: $1"
-
+    exit 2
-if [ "$#" -lt 2 ];then
+    ;;
-log.info "Usage: $0 check/launch/list/start packagename/desktop-file"
+esac
-exit -1
-fi 
-
-
-if [ "$1" = "check" ];then
-
-scan_desktop_file_log "$2"
-	if [ "$desktop_file_path" = "" ];then
-		log.error "No desktop file found. exit -1"
-		exit -1
-	else
-		exit 0
-	fi
-
-elif [ "$1" = "list" ];then 
-scan_desktop_file "$2"
-	if [ "$desktop_file_path" = "" ];then
-		exit -1
-	else
-		exit 0
-	fi
-elif [ "$1" = "launch" ];then 
-scan_desktop_file_log "$2"
-	if [  "$desktop_file_path" = "" ];then
-		log.error "No desktop file found. exit -1"
-		exit -1
-	fi
-
-
-launch_app "${desktop_file_path}"
-
-elif [ "$1" = "start" ];then 
-launch_app "${desktop_file_path}"
-fi

tool/store-helper/uninstaller

@@ -1,14 +1,54 @@
 #!/bin/bash
-dpkg -l | grep "^ii  $1 " > /dev/null
+# ===== ACE环境配置 =====
+declare -a ace_commands_order=(
+    "bookworm-run:amber-ce-bookworm"
+    "trixie-run:amber-ce-trixie"
+    "deepin23-run:amber-ce-deepin23"
+)
+
+# ===== 日志和函数 =====
+[ -f /opt/durapps/spark-store/bin/bashimport/log.amber ] && \
+    source /opt/durapps/spark-store/bin/bashimport/log.amber || {
+    log.info() { echo "INFO: $*"; }
+    log.warn() { echo "WARN: $*"; }
+    log.error() { echo "ERROR: $*"; }
+    log.debug() { echo "DEBUG: $*"; }
+}
+
+dpkg -s "$1" > /dev/null
 RET="$?"
 if [[ "$RET" == "0" ]] ;then
 apt autopurge $1 -y
 else
 
-if command -v bookworm-run > /dev/null;then
+for ace_entry in "${ace_commands_order[@]}"; do
-    echo "Try ACE Bookworm"
+            ace_cmd=${ace_entry%%:*}
-    bookworm-run apt autopurge $1 -y
+            if command -v "$ace_cmd" >/dev/null 2>&1; then
+                echo "----------------------------------------"
+                echo "正在检查 $ace_cmd 环境的安装..."
+                echo "----------------------------------------"
+                
+                # 在ACE环境中执行安装检测
+                $ace_cmd dpkg -l | grep "^ii  $1 " > /dev/null
+                try_run_ret="$?"
+                
 
-fi
+                # 最终检测结果处理
-fi
+                if [ "$try_run_ret" -eq 0 ]; then
+                    echo "----------------------------------------"
+                    echo "在 $ace_cmd 环境中找到了安装"
+                    echo "----------------------------------------"
+                    $ace_cmd apt autopurge $1 -y
+                else
+                    echo "----------------------------------------"
+                    echo "在 $ace_cmd 环境中未能找到安装，继续查找"
+                    echo "----------------------------------------"
+                fi
+            fi
+        done
+                    echo "----------------------------------------"
+                    echo "所有已安装的 ACE 环境中未能找到安装，退出"
+                    echo "----------------------------------------"
+                    exit "$RET"
+     fi
 exit "$RET"