mirror of
https://gitee.com/spark-store-project/spark-store
synced 2025-12-13 20:32:05 +08:00
!63 修复UOS未处理模拟软件源,新增ss-apt-fast ssupdate,杂项调整
修复UOS未处理模拟软件源
删除ssinstall的apt-fast安装功能(转移到ss-apt-fast,并且不会再对UOS安装apt-fast)
ss-apt-fast除了下载,安装和更新,全部走apt;
ss-apt-fast现在只会在安装/下载/更新时检测是否有apt-fast并处理
ss-apt-fast ssupdate 从服务器获取源链接后只更新星火源;
和 ss-apt-fast ssupdate 功能重复的内容转为调用
This commit is contained in:
@@ -48,24 +48,19 @@ if [ "$(id -u)" != "0" ];then
|
||||
#############################无root权限时
|
||||
|
||||
|
||||
IS_INSTALLED=`which apt-fast`
|
||||
if [ "$IS_INSTALLED" = "" ] ; then
|
||||
echo "未安装依赖:apt-fast 开始安装"
|
||||
echo "$upass" | sudo -S apt install apt-fast -y
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if [ "$DEPEND" != "" ] && [ "$isuos" != "" ]; then
|
||||
echo "UOS中系统依赖无法使用第三方下载工具,放弃使用apt-fast"
|
||||
echo ----------------------------------------------------------------------------------
|
||||
echo "$upass" | sudo -S dpkg -i $1 || sudo apt install -yf
|
||||
echo "$upass" | sudo -S dpkg -i $1 || sudo ss-apt-fast ssupdate && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install -yf
|
||||
|
||||
|
||||
fi
|
||||
|
||||
if [ "$DEPEND" != "" ] && [ "$isuos" = "" ]; then
|
||||
echo "检测到apt-fast,使用ss-apt-fast进行多线程下载加速"
|
||||
echo ----------------------------------------------------------------------------------
|
||||
echo "$upass" | sudo -S dpkg -i $1 || sudo ss-apt-fast install -yf
|
||||
echo "$upass" | sudo -S dpkg -i $1 || sudo ss-apt-fast ssupdate && sudo ss-apt-fast install -yf
|
||||
fi
|
||||
|
||||
|
||||
@@ -77,23 +72,17 @@ else
|
||||
|
||||
|
||||
|
||||
IS_INSTALLED=`which apt-fast`
|
||||
if [ "$IS_INSTALLED" = "" ] ; then
|
||||
echo "未安装依赖:apt-fast 开始安装"
|
||||
apt install apt-fast -y
|
||||
fi
|
||||
|
||||
|
||||
if [ "$DEPEND" != "" ] && [ "$isuos" != "" ]; then
|
||||
echo "UOS中系统依赖无法使用第三方下载工具,放弃使用apt-fast"
|
||||
echo ----------------------------------------------------------------------------------
|
||||
dpkg -i $1 || apt install -yf
|
||||
dpkg -i $1 || ss-apt-fast ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install -yf
|
||||
fi
|
||||
|
||||
if [ "$DEPEND" != "" ] && [ "$isuos" = "" ]; then
|
||||
echo "检测到apt-fast,使用ss-apt-fast进行多线程下载加速"
|
||||
echo ----------------------------------------------------------------------------------
|
||||
dpkg -i $1 || ss-apt-fast install -yf
|
||||
dpkg -i $1 || ss-apt-fast ssupdate && ss-apt-fast install -yf
|
||||
fi
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user