diff --git a/debian/changelog b/debian/changelog index 8938191..ec67721 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +spark-store (3.2.2) stable; urgency=medium + + * aptss will now refresh the system source before doing install, download, policy....etc + + +-- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.2.1) stable; urgency=medium * 更改刷新系统源的功能 diff --git a/src/main.cpp b/src/main.cpp index 6badb00..5aacfdb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -34,7 +34,7 @@ int main(int argc, char *argv[]) DAboutDialog dialog; a.setAboutDialog(&dialog); dialog.setLicense(QObject::tr("We publish this program under GPL V3")); - dialog.setVersion(DApplication::buildVersion("Version 3.2.1")); + dialog.setVersion(DApplication::buildVersion("Version 3.2.2")); dialog.setProductIcon(QIcon::fromTheme("spark-store")); // 设置Logo dialog.setProductName(QLabel::tr("Spark Store")); dialog.setDescription( @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) a.setOrganizationName("spark-union"); a.setOrganizationDomain("https://www.deepinos.org/"); a.setApplicationName("Spark Store"); //不需要翻译,否则 ~/.local/share/ 下文件夹名称也被翻译为中文 - a.setApplicationVersion(DApplication::buildVersion("3.2.1")); + a.setApplicationVersion(DApplication::buildVersion("3.2.2")); a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store"); a.setApplicationDescription( QObject::tr( diff --git a/tool/aptss b/tool/aptss index 7c2ddbd..15d96a5 100755 --- a/tool/aptss +++ b/tool/aptss @@ -1,11 +1,5 @@ #/bin/bash - - - - -if [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] || [ "$1" = "download" ] ; then - if [ ! -e "/tmp/aptss-conf/apt-fast.conf" ];then ###刷新apt-fast配置 mkdir -p /tmp/aptss-conf/ @@ -17,12 +11,23 @@ chmod -R 755 /tmp/aptss-conf fi + + + + + + + +if [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] || [ "$1" = "download" ] ; then + DEPEND=`which apt-fast` if [ "$DEPEND" = "" ] ; then echo "未安装依赖:apt-fast 开始安装" -sudo aptss 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 +aptss 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 +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 -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list" -o Dir::etc::sourceparts="-" -o APT::Get::List-Cleanup="0" + ###执行 bwrap --dev-bind / / \ --bind '/tmp/aptss-conf/apt-fast.conf' /etc/apt-fast.conf \ @@ -30,6 +35,15 @@ bwrap --dev-bind / / \ apt-fast "$@" --allow-downgrades +elif [ "$1" = "policy" ] || [ "$1" = "search" ];then +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 -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list" -o Dir::etc::sourceparts="-" -o APT::Get::List-Cleanup="0" + +###执行 +bwrap --dev-bind / / \ + --bind '/tmp/aptss-conf/apt-fast.conf' /etc/apt-fast.conf \ + --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \ + apt "$@" --allow-downgrades + elif [ "$1" = "ssupdate" ];then mkdir -p /tmp/aptss-conf/ diff --git a/tool/ssinstall b/tool/ssinstall index db7ee0a..749d336 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -65,7 +65,7 @@ fi if [ "$DEPEND" != "" ] && [ "$isuos" = "" ]; then echo "检测到apt-fast,使用aptss进行多线程下载加速" echo ---------------------------------------------------------------------------------- -echo "$upass" | sudo -S dpkg -i $1 || sudo aptss ssupdate && sudo aptss install -yf +echo "$upass" | sudo -S dpkg -i $1 || sudo aptss install -yf fi @@ -90,7 +90,7 @@ fi if [ "$DEPEND" != "" ] && [ "$isuos" = "" ]; then echo "检测到apt-fast,使用aptss进行多线程下载加速" echo ---------------------------------------------------------------------------------- -dpkg -i $1 || aptss ssupdate && aptss install -yf +dpkg -i $1 || aptss install -yf fi