diff --git a/debian/changelog b/debian/changelog index 7351f6b..2cba1f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ spark-store (3.1.4-1) stable; urgency=medium * 安装脚本和检测更新脚本检查网络时间超时时间延长至5s - + * 修复:ssinstall在没有安装apt-fast的情况下首次安装需要依赖的软件时安装失败 -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 diff --git a/tool/ss-apt-fast b/tool/ss-apt-fast index ca6293c..fd619ee 100755 --- a/tool/ss-apt-fast +++ b/tool/ss-apt-fast @@ -18,7 +18,7 @@ chmod -R 755 /tmp/ss-apt-fast-conf DEPEND=`which apt-fast` if [ "$DEPEND" = "" ] ; then echo "未安装依赖:apt-fast 开始安装" -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 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 apt-fast -y +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 apt-fast -y fi ###执行安装 bwrap --dev-bind / / \ diff --git a/tool/ssinstall b/tool/ssinstall index e57a6c9..34d0932 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -47,7 +47,12 @@ isuos=`cat /etc/os-release | grep UnionTech` if [ "$(id -u)" != "0" ];then #############################无root权限时 +IS_INSTALLED=`which apt-fast` +if [ "$IS_INSTALLED" = "" ] ; then +echo "未安装依赖:apt-fast 开始安装" +echo "$upass" | sudo -S /usr/local/bin/ss-apt-fast ssupdate && echo "$upass" | sudo -S 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 apt-fast -y +fi if [ "$DEPEND" != "" ] && [ "$isuos" != "" ]; then echo "UOS中系统依赖无法使用第三方下载工具,放弃使用apt-fast" @@ -70,8 +75,11 @@ fi else ###########################有root权限时 - - +IS_INSTALLED=`which apt-fast` +if [ "$IS_INSTALLED" = "" ] ; then +echo "未安装依赖:apt-fast 开始安装" +/usr/local/bin/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 install apt-fast -y +fi if [ "$DEPEND" != "" ] && [ "$isuos" != "" ]; then echo "UOS中系统依赖无法使用第三方下载工具,放弃使用apt-fast"