update debian/changelog.

Signed-off-by: shenmo <jifengshenmo@outlook.com>

debian/changelog

@@ -1,3 +1,11 @@
+spark-store (3.3.3~test1) stable; urgency=medium
+
+  * 3.3.3将会是修复大部分bug后的最终版本
+  * 图形环境中所有root权限的组件剥离到cli(可用于deepin 23 daily，只保证商店本体正常运作，不处理安装依赖不满足)
+  * 文案更改：更新检查-->检查更新
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 spark-store (3.3.1~test1) 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

pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade-worker.policy

@@ -4,15 +4,15 @@
 <policyconfig>
     <vendor>Spark Store</vendor>
     <icon_name>x-package-repository</icon_name>
-    <action id="store.spark-app.ss-do-upgrade">
+    <action id="store.spark-app.ss-do-upgrade-worker">
-        <description>运行ss-do-upgrade需要权限</description>
+        <description>运行ss-do-upgrade-worker需要权限</description>
-        <message>要使用ss-do-upgrade需要权限</message>
+        <message>要使用ss-do-upgrade-worker需要权限</message>
         <defaults>
             <allow_any>yes</allow_any>
             <allow_inactive>yes</allow_inactive>
             <allow_active>yes</allow_active>
         </defaults>
-        <annotate key="org.freedesktop.policykit.exec.path">/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh</annotate>
+        <annotate key="org.freedesktop.policykit.exec.path">/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh</annotate>
         <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
     </action>
 </policyconfig>

spark-store-project.pro

@@ -36,7 +36,7 @@ desktop.path = /usr/share/applications
 service.files += pkg/usr/lib/systemd/system/spark-update-notifier.service
 service.path = /usr/lib/systemd/system/
 
-polkit-1.files +=pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade.policy
+polkit-1.files +=pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade-worker.policy
 polkit-1.path = /usr/share/polkit-1/actions/
 
 

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

@@ -0,0 +1,18 @@
+#!/bin/bash
+if [ "$(id -u)" != "0" ];then
+pkexec "$0" "$@"
+exit
+fi
+
+
+case $1 in 
+	ssupdate)
+	aptss ssupdate
+	;;
+	upgradable-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
+	;;
+	upgrade-app)
+	aptss install "${@:2}" --only-upgrade
+	
+esac

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

@@ -1,11 +1,8 @@
 #!/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)" 
+pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh ssupdate | zenity --progress --auto-close --no-cancel --pulsate --text="正在检查更新，请稍候..." --height 70 --width 400 --title="星火商店更新模块"
+PKG_LIST="$(pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgradable-list)" 
 ####如果没更新，就弹出不需要更新
 if [ -z "$PKG_LIST" ];then
 zenity --info --icon-name=spark-store --text "没有软件需要更新\n但是你并没有站在世界之巅" --title "星火商店更新检测服务" --height 150 --width 300
@@ -28,7 +25,7 @@ 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="星火商店更新模块"
+pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgrade-app $PKG_UPGRADE_LIST -y | zenity --progress --auto-close --no-cancel --pulsate --text=正在更新已选中的应用，请稍候... --height 70 --width 400 --title="星火商店更新模块"
 
 if [ "$?" = "0" ];then