diff --git a/README.md b/README.md index 0e4fb47..655ed3c 100644 --- a/README.md +++ b/README.md @@ -152,7 +152,7 @@ You will see an output, and that's your system architecture. Please refer to the [Spark App Store FAQ and Support Guide](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.md). -You can also check the [Chinese version](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.zh.md) here. +To customly configure aptss, refer to [aptss](https://gitee.com/GXDE-OS/aptss) --- diff --git a/README.zh.md b/README.zh.md index 6072799..0b4a84c 100644 --- a/README.zh.md +++ b/README.zh.md @@ -171,9 +171,11 @@ https://github.com/spark-store-project/spark-store ## 常见问题(FAQ) -请参见[星火应用商店FAQ与支持指南](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.md)。 +请参见[星火应用商店FAQ与支持指南](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.zh.md)。 + +自定义配置 aptss config 请参阅 [aptss](https://gitee.com/GXDE-OS/aptss) + -在这里可以查阅[中文版本](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.zh.md)。 --- diff --git a/tool/apt-fast/ss-apt-fast b/tool/apt-fast/ss-apt-fast index 17abb7b..dea3648 100755 --- a/tool/apt-fast/ss-apt-fast +++ b/tool/apt-fast/ss-apt-fast @@ -186,12 +186,21 @@ VERBOSE_OUTPUT= # Download command. _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} -i ${DLLIST} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} --connect-timeout=60 --timeout=600 -m0' -# Load config file. -CONFFILE="/tmp/aptss-conf/apt-fast.conf" -#### Spark Store apt-fast conf is in /tmp -if [ -e "$CONFFILE" ]; then - source "$CONFFILE" -fi +# 定义默认的配置文件列表(按加载顺序排列) +CONFIG_FILES=( + "/tmp/aptss-conf/apt-fast.conf" # 原始配置文件位置 + "/etc/aptss/apt-fast.conf" # 系统级配置 +) + + +# 按顺序加载所有配置文件 +for conf_file in "${CONFIG_FILES[@]}"; do + if [ -e "$conf_file" ]; then + source "$conf_file" + fi +done + + # no proxy as default ftp_proxy= diff --git a/tool/aptss b/tool/aptss index bdb8beb..228f0fc 100755 --- a/tool/aptss +++ b/tool/aptss @@ -7,7 +7,7 @@ source /opt/durapps/spark-store/bin/bashimport/log.amber load_transhell case `arch` in - x86_64) + x86_64 | i686 | i386) STORE_URL="store" STORE_LIST_URL="" ;;