update debian/DEBIAN/postinst. 不再需要新的key了

修改：     src/main.cpp

build.sh

@@ -11,9 +11,10 @@ make -j$(cat /proc/cpuinfo | grep "processor" | wc -l)
 cd ..
 
 cp ./ssinstall ./debian/opt/durapps/spark-store/bin/
+cp ./spark-dstore-patch ./debian/opt/durapps/spark-store/bin/
 cp ./build/src/spark-store ./debian/opt/durapps/spark-store/bin/
 cp ./translations/*.qm ./debian/usr/share/spark-store/translations/
 
 version=$(cat ./debian/DEBIAN/control | grep "Version" | awk -F ' '  '{print $2}')
 
-fakeroot dpkg -b ./debian ./spark-store_"$version"_amd64.deb
+fakeroot dpkg -b ./debian ./

debian/DEBIAN/control

@@ -1,10 +1,11 @@
 Package: spark-store
-Version: 3.0.3-4
+Version: 3.0.3-8
 Maintainer: shenmo <shenmo@spark-app.store>
 Section: utils
 Source: https://gitee.com/deepin-community-store/spark-store
-Homepage: https://gitee.com/kuyewen/spark-store/tree/multiple
+Homepage: https://gitee.com/deepin-community-store/spark-store
 Architecture: amd64
 Priority: optional
-Depends: libc6 (>= 2.14), libgcc1 (>= 1:3.0), libstdc++6 (>= 5.2), libqt5core5a (>= 5.11.0~rc1), libqt5gui5 (>= 5.11.0~rc1), libqt5widgets5 (>= 5.11.0~rc1), libqt5network5 (>= 5.11.0~rc1), libqt5webenginewidgets5 (>= 5.11.0~rc1), libqt5concurrent5 (>= 5.11.0~rc1), libdtkcore5 (>= 5.2.1-1), libdtkwidget5 (>= 5.2.1-1), libdtkgui5 (>= 5.2.0-1), libglib2.0-0, libgdk-pixbuf2.0-0, libnotify4, wget, curl, gdebi-core, gnupg
-Description: Spark Store version 3.0.3-4 update
+Depends: libc6 (>= 2.14), libgcc1 (>= 1:3.0), libstdc++6 (>= 5.2), libqt5core5a (>= 5.11.0~rc1), libqt5gui5 (>= 5.11.0~rc1), libqt5widgets5 (>= 5.11.0~rc1), libqt5network5 (>= 5.11.0~rc1), libqt5webenginewidgets5 (>= 5.11.0~rc1), libqt5concurrent5 (>= 5.11.0~rc1), libdtkcore5 (>= 5.2.1-1), libdtkwidget5 (>= 5.2.1-1), libdtkgui5 (>= 5.2.0-1), libglib2.0-0, libgdk-pixbuf2.0-0, libnotify4, wget, curl, gnupg
+Description: Spark Store version 3.0.3-8 update
+Conflicts: spark-dstore-patch(<=1.2)

debian/DEBIAN/postinst

@@ -1,17 +1,34 @@
 #!/bin/sh
 
+
+if [ "$1" = "triggered" ]; then
+	if [ -f "/usr/bin/deepin-app-store-tool" ]; then 
+	exit 0
+	fi
+  echo '--------检测到Uniontech标准软件包，运行补丁以修正安装--------'
+    /usr/local/bin/spark-dstore-patch
+  echo '-----------spark-dstore-patch补丁工具已运行完毕-----------'
+else
+
 mkdir -p /usr/local/bin
 
 ln -s -f /opt/durapps/spark-store/bin/spark-store /usr/local/bin/spark-store
 ln -s -f /opt/durapps/spark-store/bin/ssinstall /usr/local/bin/ssinstall
+ln -s -f /opt/durapps/spark-store/bin/spark-dstore-patch /usr/local/bin/spark-dstore-patch
 
 cd /tmp/spark-store-install
 wget https://d.store.deepinos.org.cn/dcs-repo.gpg-key.asc
 apt-key add dcs-repo.gpg-key.asc
+# wget https://d.store.deepinos.org.cn/ssrepokey.asc
+# apt-key add ssrepokey.asc
+
 
 update-icon-caches /usr/share/icons/hicolor || true
 update-desktop-database /usr/share/applications || true
 xdg-mime default spark-store.desktop x-scheme-handler/spk
 update-mime-database /usr/share/mime || true
 
+exit 0
+fi
+exit 0
 # /tmp/spark-store-install/feedback.sh

debian/DEBIAN/postrm

@@ -2,6 +2,7 @@
 
 rm /usr/local/bin/spark-store
 rm /usr/local/bin/ssinstall
+rm /usr/local/bin/spark-dstore-patch
 
 update-icon-caches /usr/share/icons/hicolor || true
 update-desktop-database /usr/share/applications || true

debian/DEBIAN/triggers

@@ -0,0 +1 @@
+interest-noawait /opt/apps

src/downloadlist.cpp

@@ -51,8 +51,13 @@ downloadlist::downloadlist(QWidget *parent) :
     {
         menu_install->addAction(action_deepin);
     }
-
+    QFile gdebi("/usr/bin/gdebi");
+    gdebi.open(QIODevice::ReadOnly);
+    if(gdebi.isOpen())
+    {
         menu_install->addAction(action_gdebi);
+    }
+    
 }
 
 downloadlist::~downloadlist()

src/main.cpp

@@ -42,7 +42,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.0.3 LTS"));
+    a.setApplicationVersion(DApplication::buildVersion("3.0.3-8"));
     a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
     a.setApplicationDescription(
                 QObject::tr(

src/widget.cpp

@@ -1369,6 +1369,6 @@ void Widget::on_webEngineView_loadFinished(bool arg1)
 
 void Widget::on_pushButton_update_clicked()
 {
-    QDesktopServices::openUrl(QUrl("http://www.shenmo.tech:420/?p=485"));
+    QDesktopServices::openUrl(QUrl("https://www.deepinos.org/"));
 }
 

src/widget.ui

@@ -489,8 +489,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>889</width>
-            <height>847</height>
+            <width>903</width>
+            <height>849</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_17">
@@ -993,8 +993,8 @@
                   <rect>
                    <x>0</x>
                    <y>0</y>
-                   <width>851</width>
-                   <height>326</height>
+                   <width>869</width>
+                   <height>325</height>
                   </rect>
                  </property>
                  <layout class="QHBoxLayout" name="horizontalLayout_4">
@@ -1123,8 +1123,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>697</width>
-            <height>808</height>
+            <width>738</width>
+            <height>886</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_23">

translations/spark-store_zh_CN.ts

@@ -462,7 +462,7 @@
     <message>
         <location filename="../src/widget.ui" line="912"/>
         <source>Request Update</source>
-        <translation type="unfinished">软件催更</translation>
+        <translation type="unfinished">软件催更/应用反馈</translation>
     </message>
     <message>
         <location filename="../src/widget.ui" line="1194"/>