diff --git a/debian/changelog b/debian/changelog index 24bdc4c..03b80a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +spark-store (3.3~test3) stable; urgency=medium + + * 把检查更新加入免密码 + +-- shenmo <shenmo@spark-app.store> Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.3~test2) stable; urgency=medium * 更新检测功能全部更改到zenity diff --git a/pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade.policy b/pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade.policy new file mode 100644 index 0000000..d82d670 --- /dev/null +++ b/pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade.policy @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" + "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> +<policyconfig> + <vendor>Spark Store</vendor> + <icon_name>x-package-repository</icon_name> + <action id="store.spark-app.ss-do-upgrade"> + <description>运行ss-do-upgrade需要权限</description> + <message>要使用ss-do-upgrade需要权限</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.allow_gui">true</annotate> + </action> +</policyconfig> diff --git a/spark-store-project.pro b/spark-store-project.pro index b3d5916..d0e7d2c 100644 --- a/spark-store-project.pro +++ b/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.ssinstall.policy +polkit-1.files +=pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade.policy polkit-1.path = /usr/share/polkit-1/actions/ @@ -55,6 +55,6 @@ INSTALLS += \ preferences \ tmp \ service \ - bash_completion -# polkit-1 + bash_completion \ + polkit-1 # 暂时不添加 diff --git a/src/main.cpp b/src/main.cpp index f8b14f7..9fde06f 100644 --- a/src/main.cpp +++ b/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~test2")); + dialog.setVersion(DApplication::buildVersion("Version 3.3~test3")); 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~test2")); + a.setApplicationVersion(DApplication::buildVersion("3.3~test3")); a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store"); a.setApplicationDescription( QObject::tr( diff --git a/tool/auto-install-policy/store.spark-app.ssinstall.policy b/tool/auto-install-policy/store.spark-app.ssinstall.policy index 8bdc819..8b2111b 100644 --- a/tool/auto-install-policy/store.spark-app.ssinstall.policy +++ b/tool/auto-install-policy/store.spark-app.ssinstall.policy @@ -4,7 +4,7 @@ <policyconfig> <vendor>Spark Store</vendor> <icon_name>x-package-repository</icon_name> - <action id="org.maicss.dnf"> + <action id="store.spark-app.ssinstall"> <description>运行ssinstall需要权限</description> <message>要使用ssinstall需要权限</message> <defaults> diff --git a/tool/update-upgrade/ss-do-upgrade.sh b/tool/update-upgrade/ss-do-upgrade.sh index 28838e4..537de09 100755 --- a/tool/update-upgrade/ss-do-upgrade.sh +++ b/tool/update-upgrade/ss-do-upgrade.sh @@ -1,3 +1,4 @@ +#!/bin/bash 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)" ####如果没更新,就弹出不需要更新 if [ -z "$PKG_LIST" ];then diff --git a/tool/update-upgrade/ss-update-controler.sh b/tool/update-upgrade/ss-update-controler.sh index a7ecb1c..b6c65c0 100755 --- a/tool/update-upgrade/ss-update-controler.sh +++ b/tool/update-upgrade/ss-update-controler.sh @@ -40,7 +40,7 @@ case $option in ;; 2) - pkexec bash /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh + pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh ;; 3) if [ -f /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy ];then