!227 4266

Merge pull request !227 from shenmo/dev

debian/changelog

@@ -1,3 +1,11 @@
+spark-store (4.2.6.6) stable; urgency=medium
+  * 调整：文案修改：安装失败后引导查看详情而不是重新安装
+  * 修复：dpkg阻塞出现漏掉的安装失败，现在在安装后检测是否安装
+  * 修复：UOS专业版上安装成功仍然显示失败的问题：方式：忽略E:等消息，仅检查脚本报错
+  * 调整：卸载应用时采用autopurge以一并卸载依赖
+  
+ -- shenmo <shenmo@spark-app.store> 
+
 spark-store (4.2.6.5) stable; urgency=medium
   * 调整：ssaudit安装结束时会提示安装结束
   

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;

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."));
+        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 , you can try it again"));
+        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 , you can try it again"));
+        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."));
+        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，you can retry installation"));
+        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，you can retry installation"));
+        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();
     }

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

translations/spark-store_en.ts

@@ -357,24 +357,16 @@
     </message>
     <message>
         <location filename="../src/widgets/common/downloaditem.cpp" line="229"/>
-        <source>Error happened in dpkg progress , you can try it again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/widgets/common/downloaditem.cpp" line="230"/>
         <location filename="../src/widgets/common/downloaditem.cpp" line="231"/>
-        <source>Error happened in dpkg progress , you can try it again</source>
+        <source>Error happened in dpkg progress , please check the install info or try to reinstall.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/widgets/common/downloaditem.cpp" line="237"/>
-        <source>dpkg progress had been aborted，you can retry installation.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/widgets/common/downloaditem.cpp" line="238"/>
         <location filename="../src/widgets/common/downloaditem.cpp" line="239"/>
-        <source>dpkg progress had been aborted，you can retry installation</source>
+        <source>dpkg progress had been aborted，please check the install info or try to reinstall.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

translations/spark-store_fr.ts

@@ -357,24 +357,16 @@
     </message>
     <message>
         <location filename="../src/widgets/common/downloaditem.cpp" line="229"/>
-        <source>Error happened in dpkg progress , you can try it again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/widgets/common/downloaditem.cpp" line="230"/>
         <location filename="../src/widgets/common/downloaditem.cpp" line="231"/>
-        <source>Error happened in dpkg progress , you can try it again</source>
+        <source>Error happened in dpkg progress , please check the install info or try to reinstall.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/widgets/common/downloaditem.cpp" line="237"/>
-        <source>dpkg progress had been aborted，you can retry installation.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/widgets/common/downloaditem.cpp" line="238"/>
         <location filename="../src/widgets/common/downloaditem.cpp" line="239"/>
-        <source>dpkg progress had been aborted，you can retry installation</source>
+        <source>dpkg progress had been aborted，please check the install info or try to reinstall.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

translations/spark-store_zh_CN.ts

@@ -357,25 +357,33 @@
     </message>
     <message>
         <location filename="../src/widgets/common/downloaditem.cpp" line="229"/>
-        <source>Error happened in dpkg progress , you can try it again.</source>
-        <translation>安装被中止，可重新安装。</translation>
-    </message>
-    <message>
         <location filename="../src/widgets/common/downloaditem.cpp" line="230"/>
         <location filename="../src/widgets/common/downloaditem.cpp" line="231"/>
-        <source>Error happened in dpkg progress , you can try it again</source>
+        <source>Error happened in dpkg progress , please check the install info or try to reinstall.</source>
-        <translation>dpkg出现错误，可重新安装</translation>
+        <translation>安装被中止，请检查安装详情或尝试重新安装</translation>
     </message>
     <message>
         <location filename="../src/widgets/common/downloaditem.cpp" line="237"/>
-        <source>dpkg progress had been aborted，you can retry installation.</source>
-        <translation>dpkg进程被中断，您可重试安装。</translation>
-    </message>
-    <message>
         <location filename="../src/widgets/common/downloaditem.cpp" line="238"/>
         <location filename="../src/widgets/common/downloaditem.cpp" line="239"/>
+        <source>dpkg progress had been aborted，please check the install info or try to reinstall.</source>
+        <translation>dpkg出现错误，请检查安装详情或尝试重新安装</translation>
+    </message>
+    <message>
+        <source>Error happened in dpkg progress , you can try it again.</source>
+        <translation type="vanished">安装被中止，可重新安装。</translation>
+    </message>
+    <message>
+        <source>Error happened in dpkg progress , you can try it again</source>
+        <translation type="vanished">dpkg出现错误，可重新安装</translation>
+    </message>
+    <message>
+        <source>dpkg progress had been aborted，you can retry installation.</source>
+        <translation type="vanished">dpkg进程被中断，您可重试安装。</translation>
+    </message>
+    <message>
         <source>dpkg progress had been aborted，you can retry installation</source>
-        <translation>安装被中止，可重新安装</translation>
+        <translation type="vanished">安装被中止，可重新安装</translation>
     </message>
     <message>
         <location filename="../src/widgets/common/downloaditem.cpp" line="144"/>

translations/spark-store_zh_TW.ts

@@ -357,25 +357,33 @@
     </message>
     <message>
         <location filename="../src/widgets/common/downloaditem.cpp" line="229"/>
-        <source>Error happened in dpkg progress , you can try it again.</source>
-        <translation>安装被中止，可重新安装。</translation>
-    </message>
-    <message>
         <location filename="../src/widgets/common/downloaditem.cpp" line="230"/>
         <location filename="../src/widgets/common/downloaditem.cpp" line="231"/>
-        <source>Error happened in dpkg progress , you can try it again</source>
+        <source>Error happened in dpkg progress , please check the install info or try to reinstall.</source>
-        <translation>dpkg出现错误，可重新安装</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/widgets/common/downloaditem.cpp" line="237"/>
-        <source>dpkg progress had been aborted，you can retry installation.</source>
-        <translation>dpkg进程被中断，您可重试安装。</translation>
-    </message>
-    <message>
         <location filename="../src/widgets/common/downloaditem.cpp" line="238"/>
         <location filename="../src/widgets/common/downloaditem.cpp" line="239"/>
+        <source>dpkg progress had been aborted，please check the install info or try to reinstall.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error happened in dpkg progress , you can try it again.</source>
+        <translation type="vanished">安装被中止，可重新安装。</translation>
+    </message>
+    <message>
+        <source>Error happened in dpkg progress , you can try it again</source>
+        <translation type="vanished">dpkg出现错误，可重新安装</translation>
+    </message>
+    <message>
+        <source>dpkg progress had been aborted，you can retry installation.</source>
+        <translation type="vanished">dpkg进程被中断，您可重试安装。</translation>
+    </message>
+    <message>
         <source>dpkg progress had been aborted，you can retry installation</source>
-        <translation>安装被中止，可重新安装</translation>
+        <translation type="vanished">安装被中止，可重新安装</translation>
     </message>
     <message>
         <location filename="../src/widgets/common/downloaditem.cpp" line="144"/>