diff --git a/debian/changelog b/debian/changelog index 5cb748e..5e1bb3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -spark-store (4.8.2) UNRELEASED; urgency=medium +spark-store (4.8.3) UNRELEASED; urgency=medium * 更新软件主图标 * 软件更新器更新成功后删除软件包 * 修复:首次安装ACE环境情况下无法正确配置ACE中aptss的问题 * 修复:使用aptss后在/tmp下留下垃圾的问题 + * aptss 更新,支持在APM下使用 -- momen Tue, 28 Aug 2025 01:03:08 +0800 diff --git a/tool/aptss b/tool/aptss index acee277..2bfa0ca 100755 --- a/tool/aptss +++ b/tool/aptss @@ -2,11 +2,19 @@ SPARK_DOWNLOAD_SERVER_URL="https://d.spark-app.store/" SPARK_DOWNLOAD_SERVER_URL_NO_PROTOCOL="d.spark-app.store" + +if [[ "$IS_APM_ENV" = "" ]] ;then +UPSTREAM_CATOGARY="sparkstore" +else +UPSTREAM_CATOGARY="apm" +fi + source /opt/durapps/spark-store/bin/bashimport/transhell.amber source /opt/durapps/spark-store/bin/bashimport/log.amber load_transhell -case `arch` in +if [[ "$IS_APM_ENV" = "" ]] ;then +case $(arch) in x86_64 | i686 | i386) STORE_URL="store" STORE_LIST_URL="" @@ -24,6 +32,27 @@ case `arch` in STORE_LIST_URL="-riscv64" ;; esac +else +case $(arch) in + x86_64 | i686 | i386) + STORE_URL="amd64-apm" + STORE_LIST_URL="" + ;; + aarch64) + STORE_URL="aarch64-apm" + STORE_LIST_URL="-aarch64" + ;; + loongarch64) + STORE_URL="loong64-apm" + STORE_LIST_URL="-loong64" + ;; + riscv64) + STORE_URL="riscv64-apm" + STORE_LIST_URL="-riscv64" + ;; +esac +fi + SS_APT_FAST="/opt/durapps/spark-store/bin/apt-fast/ss-apt-fast" @@ -32,8 +61,8 @@ is_empty_dir(){ } function update_list(){ -curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "${SPARK_DOWNLOAD_SERVER_URL}/sparkstore${STORE_LIST_URL}.list" -log.info "sparkstore${STORE_LIST_URL}.list update done" +curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/aptss.list "${SPARK_DOWNLOAD_SERVER_URL}/${UPSTREAM_CATOGARY}${STORE_LIST_URL}.list" +log.info "${UPSTREAM_CATOGARY}${STORE_LIST_URL}.list update done" } function update_conf(){ @@ -110,7 +139,7 @@ echo update_list update_conf -/usr/bin/apt update -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" -o Dir::Etc::sourcelist="/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list" +/usr/bin/apt update -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" -o Dir::Etc::sourcelist="/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/aptss.list" #只更新星火源 diff --git a/tool/ssaudit b/tool/ssaudit index ad5610e..9654f8d 100755 --- a/tool/ssaudit +++ b/tool/ssaudit @@ -59,14 +59,48 @@ FORCE_CREATE_DESKTOP="0" load_transhell_debug export DEBIAN_FRONTEND=noninteractive # 根据架构设置仓库URL +if [[ "$IS_APM_ENV" = "" ]] ;then case $(arch) in - x86_64) STORE_URL="store" ;; - aarch64) STORE_URL="aarch64-store" ;; - loongarch64) STORE_URL="loong64-store" ;; + x86_64 | i686 | i386) + STORE_URL="store" + STORE_LIST_URL="" + ;; + aarch64) + STORE_URL="aarch64-store" + STORE_LIST_URL="-aarch64" + ;; + loongarch64) + STORE_URL="loong64-store" + STORE_LIST_URL="-loong64" + ;; + riscv64) + STORE_URL="riscv64-store" + STORE_LIST_URL="-riscv64" + ;; esac +else +case $(arch) in + x86_64 | i686 | i386) + STORE_URL="amd64-apm" + STORE_LIST_URL="" + ;; + aarch64) + STORE_URL="aarch64-apm" + STORE_LIST_URL="-aarch64" + ;; + loongarch64) + STORE_URL="loong64-apm" + STORE_LIST_URL="-loong64" + ;; + riscv64) + STORE_URL="riscv64-apm" + STORE_LIST_URL="-riscv64" + ;; +esac +fi # 帮助函数 function show_help() { - echo "Spark Store Anstall script. 星火商店审核脚本" + echo "Spark Store Audit script. 星火商店审核脚本" echo "用法: $0 [选项] " echo "选项:" echo " -h, --help 显示帮助信息" diff --git a/tool/ssinstall b/tool/ssinstall index a1e44b6..365902f 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -59,11 +59,45 @@ FORCE_CREATE_DESKTOP="0" load_transhell_debug export DEBIAN_FRONTEND=noninteractive # 根据架构设置仓库URL +if [[ "$IS_APM_ENV" = "" ]] ;then case $(arch) in - x86_64) STORE_URL="store" ;; - aarch64) STORE_URL="aarch64-store" ;; - loongarch64) STORE_URL="loong64-store" ;; + x86_64 | i686 | i386) + STORE_URL="store" + STORE_LIST_URL="" + ;; + aarch64) + STORE_URL="aarch64-store" + STORE_LIST_URL="-aarch64" + ;; + loongarch64) + STORE_URL="loong64-store" + STORE_LIST_URL="-loong64" + ;; + riscv64) + STORE_URL="riscv64-store" + STORE_LIST_URL="-riscv64" + ;; esac +else +case $(arch) in + x86_64 | i686 | i386) + STORE_URL="amd64-apm" + STORE_LIST_URL="" + ;; + aarch64) + STORE_URL="aarch64-apm" + STORE_LIST_URL="-aarch64" + ;; + loongarch64) + STORE_URL="loong64-apm" + STORE_LIST_URL="-loong64" + ;; + riscv64) + STORE_URL="riscv64-apm" + STORE_LIST_URL="-riscv64" + ;; +esac +fi # 帮助函数 function show_help() { echo "Spark Store Install script. 星火商店安装脚本"