From 5900b3cdf371b8c9a997c4ad53ed877f8b996297 Mon Sep 17 00:00:00 2001 From: shenmo Date: Mon, 24 Oct 2022 09:12:37 +0800 Subject: [PATCH 01/11] =?UTF-8?q?feat:=E5=AE=89=E8=A3=85=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E9=9C=80=E8=A6=81=E7=BD=91=E7=BB=9C=20modify:=20?= =?UTF-8?q?=E4=B8=BA=E4=BA=86CI=E7=9A=84=E6=9E=84=E5=BB=BA=E9=80=9F?= =?UTF-8?q?=E5=BA=A6=EF=BC=8C=E5=9C=A8=E6=9E=84=E5=BB=BA=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E5=86=8D=E4=BE=9D=E8=B5=96=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 6 ++++++ debian/control | 3 ++- debian/spark-store.postinst | 6 +++--- debian/spark-store.preinst | 3 ++- src/main.cpp | 4 ++-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index faa8a8b..df883b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +spark-store (3.3.1~test1) stable; urgency=medium + + * 安装时不再需要联网 + +-- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.3.0.4) stable; urgency=medium * 为减轻服务器压力，不再单独更新某一个应用，而是作为整体更新 diff --git a/debian/control b/debian/control index db6434c..a261481 100644 --- a/debian/control +++ b/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 diff --git a/debian/spark-store.postinst b/debian/spark-store.postinst index e437c97..62ca7c1 100755 --- a/debian/spark-store.postinst +++ b/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 - - aptss ssupdate + # Now abandoned as aptss now run ssupdate everytime + #aptss ssupdate # Start upgrade detect service diff --git a/debian/spark-store.preinst b/debian/spark-store.preinst index e6ac3bd..1eae804 100755 --- a/debian/spark-store.preinst +++ b/debian/spark-store.preinst @@ -24,4 +24,5 @@ function network-check() } -network-check +#network-check +echo "不再检测网络" \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index f54bac9..c2eae1f 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.0.4")); + 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.4")); + a.setApplicationVersion(DApplication::buildVersion("3.3.1~test1")); a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store"); a.setApplicationDescription( QObject::tr( From 495ef3292e0e80241b7f1cac22e7409bdaf7a801 Mon Sep 17 00:00:00 2001 From: shenmo Date: Mon, 24 Oct 2022 09:15:04 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=E5=A2=9E=E5=8A=A0=E5=88=B0?= =?UTF-8?q?15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tool/update-upgrade/ss-update-notifier.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/update-upgrade/ss-update-notifier.sh b/tool/update-upgrade/ss-update-notifier.sh index 0a376d1..6b74858 100755 --- a/tool/update-upgrade/ss-update-notifier.sh +++ b/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 From a6e9dac2f99f297d1497a93064235bc4564e04c9 Mon Sep 17 00:00:00 2001 From: shenmo Date: Mon, 24 Oct 2022 09:22:07 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=B2=A1=E5=95=A5=E7=94=A8=EF=BC=8C?= =?UTF-8?q?=E5=8F=88=E5=8A=A0=E5=9B=9E=E6=9D=A5=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/control | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/control b/debian/control index a261481..db6434c 100644 --- a/debian/control +++ b/debian/control @@ -14,8 +14,7 @@ Build-Depends: libdtkcore-dev(>=5.0), libdtkgui-dev(>=5.0), libdtkwidget-dev(>=5.0), -# qttools5-private-dev, -# 为了在ci中加速配置，跳过此依赖。若要配置翻译，需要安装此依赖 + qttools5-private-dev, libnotify-dev, qtwebengine5-dev Standards-Version: 3.0 From 8d84e433a6e14bc25b65cf4b9b6d8620c780b941 Mon Sep 17 00:00:00 2001 From: shenmo Date: Wed, 26 Oct 2022 15:43:43 +0800 Subject: [PATCH 04/11] =?UTF-8?q?zenity=20=E4=B8=8D=E5=86=8D=E4=BB=A5root?= =?UTF-8?q?=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 7 +++++++ ...tore.spark-app.ss-do-upgrade-worker.policy} | 8 ++++---- tool/update-upgrade/ss-do-upgrade-worker.sh | 18 ++++++++++++++++++ tool/update-upgrade/ss-do-upgrade.sh | 11 ++++------- 4 files changed, 33 insertions(+), 11 deletions(-) rename pkg/usr/share/polkit-1/actions/{store.spark-app.ss-do-upgrade.policy => store.spark-app.ss-do-upgrade-worker.policy} (70%) create mode 100755 tool/update-upgrade/ss-do-upgrade-worker.sh diff --git a/debian/changelog b/debian/changelog index df883b6..7d90720 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +spark-store (3.3.3~test1) stable; urgency=medium + + * 3.3.3将会是修复大部分bug后的最终版本 + * 图形环境中所有root权限的组件剥离到cli + +-- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.3.1~test1) stable; urgency=medium * 安装时不再需要联网 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-worker.policy similarity index 70% rename from pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade.policy rename to pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade-worker.policy index d82d670..49c5000 100644 --- 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-worker.policy @@ -4,15 +4,15 @@ Spark Store x-package-repository - - 运行ss-do-upgrade需要权限 - 要使用ss-do-upgrade需要权限 + + 运行ss-do-upgrade-worker需要权限 + 要使用ss-do-upgrade-worker需要权限 yes yes yes - /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh + /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh true diff --git a/tool/update-upgrade/ss-do-upgrade-worker.sh b/tool/update-upgrade/ss-do-upgrade-worker.sh new file mode 100755 index 0000000..666571d --- /dev/null +++ b/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 \ No newline at end of file diff --git a/tool/update-upgrade/ss-do-upgrade.sh b/tool/update-upgrade/ss-do-upgrade.sh index dc69b82..b7c5698 100755 --- a/tool/update-upgrade/ss-do-upgrade.sh +++ b/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 From f2cf344f6283e35e5d2f72da923ecc95f7d3fb89 Mon Sep 17 00:00:00 2001 From: shenmo Date: Wed, 26 Oct 2022 16:01:55 +0800 Subject: [PATCH 05/11] =?UTF-8?q?polkit=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spark-store-project.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spark-store-project.pro b/spark-store-project.pro index d0e7d2c..40d3e5e 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.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/ From 91fd97b8782724951341233e6e6d206a4ee109ab Mon Sep 17 00:00:00 2001 From: shenmo Date: Thu, 27 Oct 2022 10:37:51 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=88?= =?UTF-8?q?=EF=BC=9A=E6=A3=80=E6=9F=A5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tool/update-upgrade/ss-do-upgrade.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/update-upgrade/ss-do-upgrade.sh b/tool/update-upgrade/ss-do-upgrade.sh index b7c5698..971df5d 100755 --- a/tool/update-upgrade/ss-do-upgrade.sh +++ b/tool/update-upgrade/ss-do-upgrade.sh @@ -1,7 +1,7 @@ #!/bin/bash -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="星火商店更新模块" +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 From 0aeadb5526aee3e5dae3df18e74910c48773edcb Mon Sep 17 00:00:00 2001 From: shenmo Date: Thu, 27 Oct 2022 13:14:10 +0000 Subject: [PATCH 07/11] update debian/changelog. Signed-off-by: shenmo --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7d90720..8392604 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ spark-store (3.3.3~test1) stable; urgency=medium * 3.3.3将会是修复大部分bug后的最终版本 - * 图形环境中所有root权限的组件剥离到cli + * 图形环境中所有root权限的组件剥离到cli(可用于deepin 23 daily，只保证商店本体正常运作，不处理安装依赖不满足) + * 文案更改：更新检查-->检查更新 -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 From 5411a832dc9ed5807c56d5e6cd9a5d6ac83cc9a5 Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 28 Oct 2022 00:48:53 +0800 Subject: [PATCH 08/11] =?UTF-8?q?fix:=E6=9B=B4=E6=96=B0=E5=92=8C=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E6=9B=B4=E6=96=B0=E5=87=BA=E9=94=99=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tool/aptss | 5 ++-- tool/update-upgrade/ss-do-upgrade-worker.sh | 14 ++++++++--- tool/update-upgrade/ss-do-upgrade.sh | 28 ++++++++++++++++----- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/tool/aptss b/tool/aptss index e246557..13ff0f4 100755 --- a/tool/aptss +++ b/tool/aptss @@ -64,11 +64,10 @@ mkdir -p /tmp/aptss-conf/ echo "从服务器获取配置和镜像列表..." echo "Getting server and mirror lists..." echo -curl --progress-bar -o /tmp/aptss-conf/apt-fast.conf "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/apt-fast.conf" +curl --silent -o /tmp/aptss-conf/apt-fast.conf "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/apt-fast.conf" chmod -R 755 /tmp/aptss-conf -sudo curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list" -### 额外一份拿来给aptss自动补全用 +sudo curl --silent -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list" sudo 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 update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" #只更新星火源 diff --git a/tool/update-upgrade/ss-do-upgrade-worker.sh b/tool/update-upgrade/ss-do-upgrade-worker.sh index 666571d..37e0e58 100755 --- a/tool/update-upgrade/ss-do-upgrade-worker.sh +++ b/tool/update-upgrade/ss-do-upgrade-worker.sh @@ -7,12 +7,20 @@ fi case $1 in ssupdate) - aptss ssupdate + aptss ssupdate 2>&1 | tee /tmp/spark-store-app-ssupdate-log.txt + IS_SSUPDATE_ERROR=`cat /tmp/spark-store-app-ssupdate-log.txt | grep "E: "` + echo "$IS_SSUPDATE_ERROR" > /tmp/spark-store-app-ssupdate-status.txt ;; 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 + aptss install "${@:2}" --only-upgrade 2>&1 | tee /tmp/spark-store-app-upgrade-log.txt + IS_UPGRADE_ERROR=`cat /tmp/spark-store-app-upgrade-log.txt | grep "Package manager quit with exit code."` + echo "$IS_UPGRADE_ERROR" > /tmp/spark-store-app-upgrade-status.txt + ;; -esac \ No newline at end of file + clean-log) + rm -f /tmp/spark-store-app-ssupdate-status.txt /tmp/spark-store-app-ssupdate-log.txt /tmp/spark-store-app-upgrade-log.txt /tmp/spark-store-app-upgrade-status.txt + ;; +esac diff --git a/tool/update-upgrade/ss-do-upgrade.sh b/tool/update-upgrade/ss-do-upgrade.sh index 971df5d..012ce1b 100755 --- a/tool/update-upgrade/ss-do-upgrade.sh +++ b/tool/update-upgrade/ss-do-upgrade.sh @@ -1,7 +1,18 @@ #!/bin/bash -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="星火商店更新模块" +pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh ssupdate | zenity --progress --auto-close --pulsate --no-cancel --text="正在检查更新，请稍候..." --height 70 --width 400 --title="星火商店更新模块" + +if [ -z `cat /tmp/spark-store-app-ssupdate-status.txt` != "0" ];then +echo "无错误" +else +zenity --error --text "检查更新进程出现错误！按确定查看报错，可用于反馈" --title "星火商店更新检测服务" --height 200 --width 350 +zenity --text-info --filename=/tmp/spark-store-app-ssupdate-log.txt --checkbox="我已复制了此文本框中的日志，且将会在反馈时附上 。反馈渠道可以在右上角菜单的设置中找到" --title="反馈渠道在商店右上角的设置里" +pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh clean-log +exit +fi +pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh clean-log + PKG_LIST="$(pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgradable-list)" ####如果没更新，就弹出不需要更新 if [ -z "$PKG_LIST" ];then @@ -12,12 +23,14 @@ do #### 检测是否是hold状态 if [ "$(dpkg-query -W -f='${Status}' $PKG_NAME | grep hold)" = "" ];then echo "true" + echo "$PKG_NAME" echo "$PKG_NAME" else echo "false" - echo "$PKG_NAME (无法更新：已被标记为保留)" + echo "$PKG_NAME（无法更新：已被标记为保留）" + echo "$PKG_NAME" fi -done | zenity --list --text="选择你想更新的应用" --column=是否更新 --column=应用包名 --separator=" " --checklist --print-column=2 --multiple --height 350 --width 550 ` +done | zenity --list --text="选择你想更新的应用" --column=是否更新 --column=应用包名 --column="真的应用包名" --separator=" " --checklist --print-column=3 --multiple --height 350 --width 550 --hide-column=3` #### 如果没有选择，则直接退出 @@ -27,14 +40,17 @@ else 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 +if [ -z "`cat /tmp/spark-store-app-upgrade-status.txt`" ];then zenity --info --icon-name=spark-store --text "已选中的软件已经更新完毕" --title "星火商店更新检测服务" --height 150 --width 300 else -zenity --error --text "更新出现错误！请手动执行 sudo aptss full-upgrade 查看问题" --title "星火商店更新检测服务" --height 150 --width 300 +zenity --error --text "更新出现错误！按确定查看报错，可用于反馈" --title "星火商店更新检测服务" --height 200 --width 350 +zenity --text-info --filename=/tmp/spark-store-app-upgrade-log.txt --checkbox="我已复制了此文本框中的日志，且将会在反馈时附上 。反馈渠道可以在右上角菜单的设置中找到" --title="反馈渠道在商店右上角的设置里" fi + + fi fi -####从最开头 \ No newline at end of file +####从最开头 From dd679f3f26556ed6e1407ce59b81e53c90ce7bdf Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 28 Oct 2022 00:50:31 +0800 Subject: [PATCH 09/11] =?UTF-8?q?333t2=E6=8E=A8=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8392604..a8e3694 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +spark-store (3.3.3~test2) stable; urgency=medium + + * bug fix: 更新和检查更新出错时不报错.此更新需要一个推送 + +-- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.3.3~test1) stable; urgency=medium * 3.3.3将会是修复大部分bug后的最终版本 From 833a8ec14b8a400a9331495e5e3c00158b811089 Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 28 Oct 2022 00:52:25 +0800 Subject: [PATCH 10/11] version --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index c2eae1f..b41fcaf 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.1~test1")); + dialog.setVersion(DApplication::buildVersion("Version 3.3.3~test2")); 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.3~test2")); a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store"); a.setApplicationDescription( QObject::tr( From 9969f4f2fc73c58c101f45b7490160ee3dfcd8c2 Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 28 Oct 2022 00:57:02 +0800 Subject: [PATCH 11/11] =?UTF-8?q?just=20in=20case=E6=9C=89=E4=BA=9B?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B2=A1=E6=9C=89=E6=89=BE=E5=88=B0QQ?= =?UTF-8?q?=E7=BE=A4....?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tool/update-upgrade/ss-do-upgrade.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/update-upgrade/ss-do-upgrade.sh b/tool/update-upgrade/ss-do-upgrade.sh index 012ce1b..b548506 100755 --- a/tool/update-upgrade/ss-do-upgrade.sh +++ b/tool/update-upgrade/ss-do-upgrade.sh @@ -45,7 +45,7 @@ if [ -z "`cat /tmp/spark-store-app-upgrade-status.txt`" ];then zenity --info --icon-name=spark-store --text "已选中的软件已经更新完毕" --title "星火商店更新检测服务" --height 150 --width 300 else zenity --error --text "更新出现错误！按确定查看报错，可用于反馈" --title "星火商店更新检测服务" --height 200 --width 350 -zenity --text-info --filename=/tmp/spark-store-app-upgrade-log.txt --checkbox="我已复制了此文本框中的日志，且将会在反馈时附上 。反馈渠道可以在右上角菜单的设置中找到" --title="反馈渠道在商店右上角的设置里" +zenity --text-info --filename=/tmp/spark-store-app-upgrade-log.txt --checkbox="我已复制了此文本框中的日志，且将会在反馈时附上 。反馈渠道可以在右上角菜单的设置中找到" --title="反馈渠道在商店右上角的设置里往下拉" fi