更新提示超时时间增加到15

modify: 为了CI的构建速度，在构建依赖中不再依赖语言工具

debian/changelog

@@ -1,3 +1,31 @@
+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
+
+  * 为减轻服务器压力，不再单独更新某一个应用，而是作为整体更新
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.3.0.3) stable; urgency=medium
+
+  * 回滚 更新中行为到进度条而不是实时输出
+  * 更新应用时显示正在更新哪个应用
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.3.0.2) stable; urgency=medium
+
+  * 修复 pkexec未执行
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 spark-store (3.3.0.1) stable; urgency=medium
 
   * 修复 检查更新的更新进程未实际运行

debian/control

@@ -14,7 +14,8 @@ 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
 
-		# Download and install key
+		# 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,4 +24,5 @@ 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.0.1"));
+      dialog.setVersion(DApplication::buildVersion("Version 3.3.1~test1"));
       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.0.1"));
+    a.setApplicationVersion(DApplication::buildVersion("3.3.1~test1"));
     a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
     a.setApplicationDescription(
                 QObject::tr(

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

@@ -1,4 +1,9 @@
 #!/bin/bash
+if [ "$(id -u)" != "0" ];then
+pkexec $0
+exit
+fi
+
 bash aptss ssupdate | zenity --progress --auto-close --no-cancel --pulsate --text=正在更新检查，请稍候... --height 70 --width 400 --title="星火商店更新模块"
 PKG_LIST="$(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 list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" | awk 'BEGIN {FS="/"} {print $1}' | awk NR\>1)" 
 ####如果没更新，就弹出不需要更新
@@ -13,7 +18,7 @@ do
        echo "$PKG_NAME"
 	else
 	echo "false"
-	echo "$PKG_NAME (无法更新：请先执行 sudo apt-mark unhold 后再更新)"
+	echo "$PKG_NAME (无法更新：已被标记为保留)"
 	fi
 done | zenity --list --text="选择你想更新的应用" --column=是否更新 --column=应用包名 --separator=" " --checklist --print-column=2 --multiple --height 350 --width 550 ` 
 
@@ -22,6 +27,7 @@ done | zenity --list --text="选择你想更新的应用" --column=是否更新
 if [ "$PKG_UPGRADE_LIST" = "" ];then
 zenity --info --icon-name=spark-store --text "没有选中任何软件\n但是你并没有站在世界之巅" --title "星火商店更新检测服务" --height 150 --width 300
 else
+
 bash aptss install $PKG_UPGRADE_LIST -y | zenity --progress --auto-close --no-cancel --pulsate --text=正在更新已选中的应用，请稍候... --height 70 --width 400 --title="星火商店更新模块"
 
 if [ "$?" = "0" ];then

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

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