From f04130f90246f018e88b6077e77bf812280817df Mon Sep 17 00:00:00 2001 From: shenmo Date: Wed, 2 Aug 2023 11:16:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9AUOS=E4=B8=93?= =?UTF-8?q?=E4=B8=9A=E7=89=88=E4=B8=8A=E5=AE=89=E8=A3=85=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E4=BB=8D=E7=84=B6=E6=98=BE=E7=A4=BA=E5=A4=B1=E8=B4=A5=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9A=E6=96=B9=E5=BC=8F=EF=BC=9A=E5=BF=BD?= =?UTF-8?q?=E7=95=A5E:=E7=AD=89=E6=B6=88=E6=81=AF=EF=BC=8C=E4=BB=85?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E8=84=9A=E6=9C=AC=E6=8A=A5=E9=94=99=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E5=8D=B8=E8=BD=BD=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E6=97=B6=E9=87=87=E7=94=A8autopurge=E4=BB=A5=E4=B8=80=E5=B9=B6?= =?UTF-8?q?=E5=8D=B8=E8=BD=BD=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/appintopage.cpp | 2 +- src/widgets/common/downloaditem.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/appintopage.cpp b/src/pages/appintopage.cpp index 96f94d9..f2e24bd 100644 --- a/src/pages/appintopage.cpp +++ b/src/pages/appintopage.cpp @@ -466,7 +466,7 @@ void AppIntoPage::on_pushButton_3_clicked() ui->pushButton_3->setEnabled(false); QProcess uninstall; - uninstall.start("pkexec", QStringList() << "apt" << "purge" << "-y" << info["Pkgname"].toString().toLower()); + uninstall.start("pkexec", QStringList() << "apt" << "autopurge" << "-y" << info["Pkgname"].toString().toLower()); uninstall.waitForFinished(-1); QProcess check; diff --git a/src/widgets/common/downloaditem.cpp b/src/widgets/common/downloaditem.cpp index 081cf3c..9525572 100644 --- a/src/widgets/common/downloaditem.cpp +++ b/src/widgets/common/downloaditem.cpp @@ -198,7 +198,7 @@ void DownloadItem::slotAsyncInstall(int t) for (int i = 0; i < everyOut.size(); i++) { tempOutput = everyOut[i]; - if (everyOut[i].left(2) == "E:" || tempOutput.contains("错误") || tempOutput.contains("exit code") || tempOutput.contains("OMG-IT-GOES-WRONG")) + if (everyOut[i].left(2) == tempOutput.contains("OMG-IT-GOES-WRONG")) { haveError = true; } -- Gitee From 88cc3eb9211406db9ef4e051be5ceaacd7e34828 Mon Sep 17 00:00:00 2001 From: shenmo Date: Wed, 2 Aug 2023 11:30:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A6=82=E6=9E=9Cdpkg=E9=98=BB=E5=A1=9E?= =?UTF-8?q?=E4=BC=9A=E5=87=BA=E7=8E=B0=E6=BC=8F=E6=8E=89=E7=9A=84=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E5=A4=B1=E8=B4=A5=EF=BC=8C=E5=9C=A8=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E5=90=8E=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tool/ssinstall | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tool/ssinstall b/tool/ssinstall index 94010f6..d674144 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -113,7 +113,8 @@ if [ ! -z "$IS_MD5SUM_CHECKD" ];then echo "校验成功，开始安装" echo ---------------------------------------------------------------------------------- - +package_name=$(dpkg-deb -f "$DEBPATH" Package) +echo "Package name is $package_name" try_run_output=$(/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh test-install-app "$DEBPATH") try_run_ret="$?" @@ -129,8 +130,18 @@ dpkg -i "$DEBPATH" || aptss install -yf #### --delete if [ "$?" = "0" ] && [ "$2" = "--delete-after-install" ];then -rm "$DEBPATH" +##check if is installed yet +if dpkg -s "$package_name" >/dev/null 2>&1; then + echo "软件包已安装：$package_name" + rm "$DEBPATH" echo "${TRANSHELL_CONTENT_DEB_IS_DELETED}" +else + echo "软件包未安装：$package_name" + echo "安装异常！抛出错误" +echo "OMG-IT-GOES-WRONG" +fi + + else echo "${TRANSHELL_CONTENT_WILL_NOT_DELETE_DEB}" fi -- Gitee From da9f84d78a2501e939517547ecc7f3e44c12d74b Mon Sep 17 00:00:00 2001 From: shenmo Date: Wed, 2 Aug 2023 11:35:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E6=96=87?= =?UTF-8?q?=E6=A1=88=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=AE=89=E8=A3=85=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E5=90=8E=E5=BC=95=E5=AF=BC=E6=9F=A5=E7=9C=8B=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E8=80=8C=E4=B8=8D=E6=98=AF=E9=87=8D=E6=96=B0=E5=AE=89?= =?UTF-8?q?=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widgets/common/downloaditem.cpp | 12 ++++++------ translations/spark-store_en.ts | 12 ++---------- translations/spark-store_fr.ts | 12 ++---------- translations/spark-store_zh_CN.ts | 26 +++++++++++++++++--------- translations/spark-store_zh_TW.ts | 26 +++++++++++++++++--------- 5 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/widgets/common/downloaditem.cpp b/src/widgets/common/downloaditem.cpp index 9525572..045647d 100644 --- a/src/widgets/common/downloaditem.cpp +++ b/src/widgets/common/downloaditem.cpp @@ -226,17 +226,17 @@ void DownloadItem::slotAsyncInstall(int t) ui->pushButton_install->show(); ui->pushButton_install->setText(tr("Retry")); download = 1; - Utils::sendNotification("spark-store", tr("Spark Store"), tr("Error happened in dpkg progress , you can try it again.")); - ui->label_2->setText(tr("Error happened in dpkg progress , you can try it again")); - ui->label_2->setToolTip(tr("Error happened in dpkg progress , you can try it again")); + Utils::sendNotification("spark-store", tr("Spark Store"), tr("Error happened in dpkg progress , please check the install info or try to reinstall.")); + ui->label_2->setText(tr("Error happened in dpkg progress , please check the install info or try to reinstall.")); + ui->label_2->setToolTip(tr("Error happened in dpkg progress , please check the install info or try to reinstall.")); ui->pushButton_3->show(); } if (notRoot) { - Utils::sendNotification("spark-store", tr("Spark Store"), tr("dpkg progress had been aborted，you can retry installation.")); - ui->label_2->setText(tr("dpkg progress had been aborted，you can retry installation")); - ui->label_2->setToolTip(tr("dpkg progress had been aborted，you can retry installation")); + Utils::sendNotification("spark-store", tr("Spark Store"), tr("dpkg progress had been aborted，please check the install info or try to reinstall.")); + ui->label_2->setText(tr("dpkg progress had been aborted，please check the install info or try to reinstall.")); + ui->label_2->setToolTip(tr("dpkg progress had been aborted，please check the install info or try to reinstall.")); ui->pushButton_install->show(); ui->pushButton_3->hide(); } diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts index d9d5a4e..6cceda9 100644 --- a/translations/spark-store_en.ts +++ b/translations/spark-store_en.ts @@ -357,24 +357,16 @@ - Error happened in dpkg progress , you can try it again. - - - - Error happened in dpkg progress , you can try it again + Error happened in dpkg progress , please check the install info or try to reinstall. - dpkg progress had been aborted，you can retry installation. - - - - dpkg progress had been aborted，you can retry installation + dpkg progress had been aborted，please check the install info or try to reinstall. diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts index 6f4b6a0..7794988 100644 --- a/translations/spark-store_fr.ts +++ b/translations/spark-store_fr.ts @@ -357,24 +357,16 @@ - Error happened in dpkg progress , you can try it again. - - - - Error happened in dpkg progress , you can try it again + Error happened in dpkg progress , please check the install info or try to reinstall. - dpkg progress had been aborted，you can retry installation. - - - - dpkg progress had been aborted，you can retry installation + dpkg progress had been aborted，please check the install info or try to reinstall. diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index da61a4b..8e7de18 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -357,25 +357,33 @@ + + + Error happened in dpkg progress , please check the install info or try to reinstall. + 安装被中止，请检查安装详情或尝试重新安装 + + + + + + dpkg progress had been aborted，please check the install info or try to reinstall. + dpkg出现错误，请检查安装详情或尝试重新安装 + + Error happened in dpkg progress , you can try it again. - 安装被中止，可重新安装。 + 安装被中止，可重新安装。 - - Error happened in dpkg progress , you can try it again - dpkg出现错误，可重新安装 + dpkg出现错误，可重新安装 - dpkg progress had been aborted，you can retry installation. - dpkg进程被中断，您可重试安装。 + dpkg进程被中断，您可重试安装。 - - dpkg progress had been aborted，you can retry installation - 安装被中止，可重新安装 + 安装被中止，可重新安装 diff --git a/translations/spark-store_zh_TW.ts b/translations/spark-store_zh_TW.ts index 5537dda..8fc5d6e 100644 --- a/translations/spark-store_zh_TW.ts +++ b/translations/spark-store_zh_TW.ts @@ -357,25 +357,33 @@ + + + Error happened in dpkg progress , please check the install info or try to reinstall. + + + + + + + dpkg progress had been aborted，please check the install info or try to reinstall. + + + Error happened in dpkg progress , you can try it again. - 安装被中止，可重新安装。 + 安装被中止，可重新安装。 - - Error happened in dpkg progress , you can try it again - dpkg出现错误，可重新安装 + dpkg出现错误，可重新安装 - dpkg progress had been aborted，you can retry installation. - dpkg进程被中断，您可重试安装。 + dpkg进程被中断，您可重试安装。 - - dpkg progress had been aborted，you can retry installation - 安装被中止，可重新安装 + 安装被中止，可重新安装 -- Gitee From 1f98c8df7c39c0b8be913eed9e9b6a0c91ce6c25 Mon Sep 17 00:00:00 2001 From: shenmo Date: Wed, 2 Aug 2023 11:40:56 +0800 Subject: [PATCH 4/4] bump-4266 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1f47705..7a3f2fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +spark-store (4.2.6.6) stable; urgency=medium + * 调整：文案修改：安装失败后引导查看详情而不是重新安装 + * 修复：dpkg阻塞出现漏掉的安装失败，现在在安装后检测是否安装 + * 修复：UOS专业版上安装成功仍然显示失败的问题：方式：忽略E:等消息，仅检查脚本报错 + * 调整：卸载应用时采用autopurge以一并卸载依赖 + + -- shenmo + spark-store (4.2.6.5) stable; urgency=medium * 调整：ssaudit安装结束时会提示安装结束 -- Gitee