Merge branch 'master' of https://gitee.com/deepin-community-store/spark-store

debian/changelog

@@ -1,3 +1,11 @@
+spark-store (3.1.5-1) stable; urgency=medium
+
+  * 改变更新策略，UOS也下载加速，但是安装不加速
+
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 spark-store (3.1.5) stable; urgency=medium
 
   * 改变更新策略，现在支持应用在更新时引入新依赖

src/main.cpp

@@ -30,7 +30,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.1.5"));
+      dialog.setVersion(DApplication::buildVersion("Version 3.1.5-1"));
       dialog.setProductIcon(QIcon::fromTheme("spark-store"));  // 设置Logo
       dialog.setProductName(QLabel::tr("Spark Store"));
       dialog.setDescription(
@@ -51,7 +51,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.1.5"));
+    a.setApplicationVersion(DApplication::buildVersion("3.1.5-1"));
     a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
     a.setApplicationDescription(
                 QObject::tr(

tool/update-upgrade/ss-do-upgrade.sh

@@ -9,9 +9,17 @@ PKG_LIST="$(bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-c
 
 
 isuos=`cat /etc/os-release | grep UnionTech`
-if [ "$isuos" != "" ]; then ###这是确定是否为UOS
+if [ "$isuos" != "" ]; then ###这是确定是否为UOS 如果是
-echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast"
+echo "UOS中系统依赖无法使用第三方下载工具，使用apt-fast下载本体"
 
+  cd /var/cache/apt/archives
+  for PKG_NAME in $PKG_LIST;
+  do
+    echo "$PKG_NAME 正在下载..."
+  sudo /usr/local/bin/ss-apt-fast download "$PKG_NAME" -y >/dev/null 2>&1;
+  done
+   
+  echo "----开始安装"
   for PKG_NAME in $PKG_LIST;
   do
     echo "$PKG_NAME 正在准备更新..."
@@ -23,6 +31,8 @@ echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast
     fi
   done
 
+
+
 else ###这是确定是否为UOS
 
   for PKG_NAME in $PKG_LIST;