!140 3304 策略调整 选中的应用作为整体更新，降低服务器压力

Merge pull request !140 from shenmo/dev

debian/changelog

@@ -1,9 +1,3 @@
-spark-store (3.3.1~test1) stable; urgency=medium
-
-  * 安装时不再需要联网
-
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
 spark-store (3.3.0.4) stable; urgency=medium
 
   * 为减轻服务器压力，不再单独更新某一个应用，而是作为整体更新

debian/control

@@ -14,8 +14,7 @@ Build-Depends:
  libdtkcore-dev(>=5.0),
  libdtkgui-dev(>=5.0),
  libdtkwidget-dev(>=5.0),
-# qttools5-private-dev,
+ qttools5-private-dev,
-# 为了在ci中加速配置，跳过此依赖。若要配置翻译，需要安装此依赖
  libnotify-dev,
  qtwebengine5-dev
 Standards-Version: 3.0

debian/spark-store.postinst

@@ -30,7 +30,7 @@ case "$1" in
 
 		gcc /opt/durapps/spark-store/bin/ss-feedback/sender-d.sh.c -o /opt/durapps/spark-store/bin/ss-feedback/sender-d
 
-		# Install key
+		# Download and install key
 		mkdir -p /tmp/spark-store-install/
 		cp -f /opt/durapps/spark-store/bin/spark-store.asc  /tmp/spark-store-install/spark-store.asc
 		gpg --dearmor /tmp/spark-store-install/spark-store.asc
@@ -39,8 +39,8 @@ case "$1" in
 
 
         	# Run apt update to avoid users being fucked up by the non-exist dependency problem
-		# Now abandoned as aptss now run ssupdate everytime
+
-		#aptss ssupdate
+		aptss ssupdate
 
 
 		# Start upgrade detect service

debian/spark-store.preinst

@@ -24,5 +24,4 @@ function network-check()
 }
 
 
-#network-check
+network-check
-echo "不再检测网络"

src/main.cpp

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

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

@@ -19,7 +19,7 @@ function notify-send() {
 function network()
 {
     #超时时间
-    local timeout=15
+    local timeout=5
 
     #目标网站
     local target=www.baidu.com