diff --git a/debian/changelog b/debian/changelog index 1f4770532f4908e179849c9b99f0f153f0d31757..7a3f2fe540a4599c432b32a4f794d191dd01c720 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安装结束时会提示安装结束 diff --git a/src/pages/appintopage.cpp b/src/pages/appintopage.cpp index 96f94d9dc5abaf7cd4eb9e7010fa6219197cd69a..f2e24bd9341e84ccb82143705b57a90c13440c58 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 081cf3caafe5d0db43239e0f577eae9d62bec1b5..045647d7f28ba10573af9544ee732437f24bc119 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; } @@ -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/tool/ssinstall b/tool/ssinstall index 94010f61ad747019a92c5dd438e6367791d781e6..d6741446d0293f98c4010b5f80810cce3c7cb1c2 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 diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts index d9d5a4e33f92abccdc283176c7e16bcc79aac8af..6cceda9a3b5e055f5f59a37540610baef3e8915c 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 6f4b6a07d2eb1a6e6837fb680945d17c67094432..77949888ab5f91b29431915c6bf1863ed9983b36 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 da61a4b9086468dba0a1bca049b484fcaa5e11f1..8e7de18cea5241dfb3d711b7db2574237d94a002 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 5537ddadd7ac92cc99f444981e91f1c196d0ebe8..8fc5d6e51bb615b327f2a296ebc9f4db0801f93d 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 - 安装被中止，可重新安装 + 安装被中止，可重新安装