spark-store-project/spark-store
14
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-store synced 2025-09-02 17:32:25 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

!70 修复：ssinstall在没有安装apt-fast的情况下首次安装需要依赖的软件时安装失败

Browse Source 
* 	修改：     debian/changelog
* 修复：ssinstall在没有安装apt-fast的情况下首次安装需要依赖的软件时安装失败
This commit is contained in:
shenmo 2022-08-08 04:35:58 +00:00
parent 114b5cdfe5
commit 0c367799b7
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,7 +1,7 @@
spark-store (3.1.4-1) stable; urgency=medium spark-store (3.1.4-1) stable; urgency=medium
* 安装脚本和检测更新脚本检查网络时间超时时间延长至5s * 安装脚本和检测更新脚本检查网络时间超时时间延长至5s
* 修复：ssinstall在没有安装apt-fast的情况下首次安装需要依赖的软件时安装失败
-- shenmo <shenmo@spark-app.store> Fri, 30 Jan 2022 00:00:00 +0800 -- shenmo <shenmo@spark-app.store> Fri, 30 Jan 2022 00:00:00 +0800

2
tool/ss-apt-fast
View File

@ -18,7 +18,7 @@ chmod -R 755 /tmp/ss-apt-fast-conf
DEPEND=`which apt-fast` DEPEND=`which apt-fast`
if [ "$DEPEND" = "" ] ; then if [ "$DEPEND" = "" ] ; then
echo "未安装依赖：apt-fast 开始安装" 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 fi
###执行安装 ###执行安装
bwrap --dev-bind / / \ bwrap --dev-bind / / \

12
tool/ssinstall
View File

@ -47,7 +47,12 @@ isuos=`cat /etc/os-release | grep UnionTech`
if [ "$(id -u)" != "0" ];then if [ "$(id -u)" != "0" ];then
#############################无root权限时 #############################无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 if [ "$DEPEND" != "" ] && [ "$isuos" != "" ]; then
echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast" echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast"
@ -70,8 +75,11 @@ fi
else else
###########################有root权限时 ###########################有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 if [ "$DEPEND" != "" ] && [ "$isuos" != "" ]; then
echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast" echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast"