!42 3.1.2

Merge pull request !42 from shenmo/master
修改： debian/changelog
2025-12-15 21:32:05 +08:00 · 2022-06-21 14:58:37 +00:00 · 2022-06-21 22:37:39 +08:00 · 2022-06-16 05:31:51 +00:00 · 2022-06-16 05:31:05 +00:00 · 2022-06-10 10:33:15 +00:00
30 changed files with 672 additions and 114 deletions
--- a/.gitee/Dockerfile
+++ b/.gitee/Dockerfile
@@ -1,2 +1,4 @@
-FROM python:3
-RUN pip3 install requests
+FROM shenmo7192/uos-21-dtk5.4:1.0
+ADD . /root/workdir
+WORKDIR /root/workdir
+RUN dpkg-buildpackage
--- a/9
+++ b/9
@@ -4,11 +4,12 @@ pipeline {
    stage('build') {
      agent {
        docker {
-          image 'sparkstore/qt-build-image:5.11-1'
+          image 'jerry979/dtke:5.11.1'
        }
+
      }
      steps {
-        sh 'mkdir build && cd build && qmake .. && make && cd ..'
+        sh 'mkdir build && cd build && qmake .. && make '
        archiveArtifacts(artifacts: 'build/src/spark-store', allowEmptyArchive: true, defaultExcludes: true)
      }
    }
@@ -18,13 +19,15 @@ pipeline {
        dockerfile {
          filename '.gitee/Dockerfile'
        }
+
      }
      environment {
        gitee_token = credentials('1')
      }
      steps {
-        sh 'python3 .gitee/callback.py'
+        sh "python3 .gitee/callback.py"
      }
    }
+
  }
 }
--- a/README.md
+++ b/README.md
@@ -1,33 +1,41 @@
-#  星火应用商店
+#  Spark App Store
 [![star](https://gitee.com/deepin-community-store/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/deepin-community-store/spark-store/stargazers)  [![fork](https://gitee.com/deepin-community-store/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/deepin-community-store/spark-store/members)

-众所周知，国内的Linux应用比较少，wine应用难以获取，优质工具分散在民间各大论坛，无法形成合力，难以改善生态
+Spark Store aims to collect Linux apps for the convieniece of Linux new comers

-生态构建需要的不是某一方的单打独斗，而是人人行动起来，汇聚星火，产生燎原之势
+The collecting process needs everyone's help

-我们创建了这个应用商店，广泛收录大家需要的软件包，搜集优质小工具，主动适配wine应用，存放到储存库供大家获取
-我们支持：Deepin 20 ; Ubuntu 22.04 LTS / Ubuntu 20.04 LTS(将会逐渐停止支持） ; UOS Home 21
+We set up this APP Store and collect APPs/tools that everyone need widely. Also we pack Windows apps with wine. 

-希望看到这里的人也可以加入我们的队伍，开发或者投递应用都很欢迎，共同构建Linux应用生态
+All packages will be shared in our repository for users to get freely. 

-如果有想要提交的软件包，请 [在这里投稿](https://upload.deepinos.org/index)
+Distrobution supported：Deepin 20 ; Ubuntu 22.04 LTS / Ubuntu 20.04 LTS(May stop support in the future） ; UniontechOS Home 21


-## 🙌 简单的开始

-如果想安装 `星火应用商店` ，请打开右侧的 [Release] 页面，找到最新版本，并选择适用于当前系统的安装包下载。
+I hope people who see here can also join our team，development help or submit applications are welcomed
+
+If you want to submit an APP to share with others，Please [Click here](https://upload.deepinos.org/index)
+
+
+## 🙌 A simple start
+
+If you simply want to install the Spark Store,just enter the  [Release] page, find the version you want and install.
+
+If you are using Debian11/Ubuntu 20.04, you will need extra dependency package. Available [here](https://d.store.deepinos.org.cn/spark-store-dependencies-kylin.zip)

 ---
-#### 编译安装
+#### Compile and developement


-Deepin V20/UOS 21/ Ubuntu 22.04 系统下, 安装依赖
+For Deepin V20/UOS 21/ Ubuntu 22.04/ Debian 11

 ```shell
-sudo apt install debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev
+sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev

 ```
-然后
+Then
+
 ```shell
 git clone https://gitee.com/deepin-community-store/spark-store.git
 cd spark-store
@@ -36,6 +44,8 @@ dpkg-buildpackage



-## 🚀 协作
+## 🚀 Coorperation

-非常感谢有兴趣的开发者或爱好者参与 `星火应用商店` 项目，分享你的见解与思路。
+We use Gitee as our code hosting platform. Please click here to contact us. 
+
+https://gitee.com/deepin-community-store/spark-store
--- a/README.zh.md
+++ b/README.zh.md
@@ -0,0 +1,43 @@
+#  星火应用商店
+[![star](https://gitee.com/deepin-community-store/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/deepin-community-store/spark-store/stargazers)  [![fork](https://gitee.com/deepin-community-store/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/deepin-community-store/spark-store/members)
+
+众所周知，国内的Linux应用比较少，wine应用难以获取，优质工具分散在民间各大论坛，无法形成合力，难以改善生态
+
+生态构建需要的不是某一方的单打独斗，而是人人行动起来，汇聚星火，产生燎原之势
+
+我们创建了这个应用商店，广泛收录大家需要的软件包，搜集优质小工具，主动适配wine应用，存放到储存库供大家获取
+我们支持：Deepin 20 ; Ubuntu 22.04 LTS / Ubuntu 20.04 LTS(将会逐渐停止支持） ; UOS Home 21
+
+希望看到这里的人也可以加入我们的队伍，开发或者投递应用都很欢迎，共同构建Linux应用生态
+
+如果有想要提交的软件包，请 [在这里投稿](https://upload.deepinos.org/index)
+
+
+## 🙌 简单的开始
+
+如果想安装 `星火应用商店` ，请打开右侧的 [Release] 页面，找到最新版本，并选择适用于当前系统的安装包下载。
+
+如果你在使用 `Debian 11/Ubuntu 20.04`，你需要额外下载[依赖补充包](https://d.store.deepinos.org.cn/spark-store-dependencies-kylin.zip)
+
+---
+#### 编译安装
+
+
+Deepin V20/UOS 21/ Ubuntu 22.04 系统下, 安装依赖
+
+```shell
+sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev
+
+```
+然后
+```shell
+git clone https://gitee.com/deepin-community-store/spark-store.git
+cd spark-store
+dpkg-buildpackage
+```
+
+
+
+## 🚀 协作
+
+非常感谢有兴趣的开发者或爱好者参与 `星火应用商店` 项目，分享你的见解与思路。
--- a/assets/Logo-Spark.png
+++ b/assets/Logo-Spark.png
--- a/assets/fonts/Yukarimobile.ttf
+++ b/assets/fonts/Yukarimobile.ttf
--- a/assets/icons.qrc
+++ b/assets/icons.qrc
@@ -34,7 +34,6 @@
        <file>icons/refresh-page.svg</file>
    </qresource>
    <qresource prefix="/">
-        <file>Logo-Spark.png</file>
        <file>tags/a2d.png</file>
        <file>tags/community.svg</file>
        <file>tags/deepin.svg</file>
@@ -51,6 +50,8 @@
        <file>tags/dwine5-small.png</file>
        <file>tags/dwine5.svg</file>
        <file>tags/dwine2-small.png</file>
+        <file>spark-store.png</file>
+        <file>spark-logo.svg</file>
    </qresource>
    <qresource prefix="/fonts">
        <file>fonts/hksnzt.ttf</file>
--- a/assets/spark-logo.svg
+++ b/assets/spark-logo.svg
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   sodipodi:docname="spark-logo.svg"
+   inkscape:version="1.1 (c4e8f9e, 2021-05-24)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 180.00012 48.251057"
+   height="48.251057mm"
+   width="180.00012mm"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient1200"
+       inkscape:collect="always">
+      <stop
+         id="stop1196"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.1299435" />
+      <stop
+         id="stop1198"
+         offset="1"
+         style="stop-color:#dadada;stop-opacity:0.81960785" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1138">
+      <stop
+         style="stop-color:#99e7ea;stop-opacity:1"
+         offset="0"
+         id="stop1134" />
+      <stop
+         style="stop-color:#007ffc;stop-opacity:1"
+         offset="1"
+         id="stop1136" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1128"
+       inkscape:collect="always">
+      <stop
+         id="stop1124"
+         offset="0"
+         style="stop-color:#99e7ea;stop-opacity:1" />
+      <stop
+         id="stop1126"
+         offset="1"
+         style="stop-color:#007ffc;stop-opacity:1" />
+    </linearGradient>
+    <inkscape:path-effect
+       only_selected="false"
+       apply_with_weight="true"
+       apply_no_weight="true"
+       helper_size="0"
+       steps="2"
+       weight="33.333333"
+       is_visible="true"
+       id="path-effect960"
+       effect="bspline"
+       lpeversion="0" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98112945,0,3.7714702)"
+       r="90.135414"
+       fy="199.86011"
+       fx="100.35268"
+       cy="199.86011"
+       cx="100.35268"
+       id="radialGradient1130"
+       xlink:href="#linearGradient1128"
+       inkscape:collect="always" />
+    <radialGradient
+       r="90.135414"
+       fy="199.86011"
+       fx="100.35268"
+       cy="199.86011"
+       cx="100.35268"
+       gradientTransform="matrix(1,0,0,0.98112945,0,3.7714702)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1132"
+       xlink:href="#linearGradient1138"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98112945,0,3.7714702)"
+       r="90.135414"
+       fy="199.86011"
+       fx="100.35268"
+       cy="199.86011"
+       cx="100.35268"
+       id="radialGradient1202"
+       xlink:href="#linearGradient1200"
+       inkscape:collect="always" />
+    <filter
+       id="filter1448"
+       inkscape:label="Drop Shadow"
+       style="color-interpolation-filters:sRGB">
+      <feFlood
+         id="feFlood1438"
+         result="flood"
+         flood-color="rgb(145,145,145)"
+         flood-opacity="0.372549" />
+      <feComposite
+         id="feComposite1440"
+         result="composite1"
+         operator="in"
+         in2="SourceGraphic"
+         in="flood" />
+      <feGaussianBlur
+         id="feGaussianBlur1442"
+         result="blur"
+         stdDeviation="5.2918"
+         in="composite1" />
+      <feOffset
+         id="feOffset1444"
+         result="offset"
+         dy="0"
+         dx="0" />
+      <feComposite
+         id="feComposite1446"
+         result="composite2"
+         operator="over"
+         in2="offset"
+         in="SourceGraphic" />
+    </filter>
+    <filter
+       id="filter2201"
+       inkscape:label="Drop Shadow"
+       style="color-interpolation-filters:sRGB">
+      <feFlood
+         id="feFlood2191"
+         result="flood"
+         flood-color="rgb(145,145,145)"
+         flood-opacity="0.372549" />
+      <feComposite
+         id="feComposite2193"
+         result="composite1"
+         operator="in"
+         in2="SourceGraphic"
+         in="flood" />
+      <feGaussianBlur
+         id="feGaussianBlur2195"
+         result="blur"
+         stdDeviation="3.76995"
+         in="composite1" />
+      <feOffset
+         id="feOffset2197"
+         result="offset"
+         dy="0"
+         dx="0" />
+      <feComposite
+         id="feComposite2199"
+         result="composite2"
+         operator="over"
+         in2="offset"
+         in="SourceGraphic" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     inkscape:window-maximized="1"
+     inkscape:window-y="0"
+     inkscape:window-x="0"
+     inkscape:window-height="946"
+     inkscape:window-width="1920"
+     showgrid="false"
+     inkscape:current-layer="layer2"
+     inkscape:document-units="mm"
+     inkscape:cy="332.14286"
+     inkscape:cx="520.71429"
+     inkscape:zoom="0.7"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:pagecheckerboard="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-34.291348,-63.035531)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1" />
+  <g
+     inkscape:label="Layer 2"
+     id="layer2"
+     inkscape:groupmode="layer"
+     transform="translate(-34.291348,33.964469)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1002"
+       d="m 50.895965,-25.80076 c 0,0 3.210258,-0.04536 6.509677,1.995776 3.299426,2.041135 5.216663,3.991553 5.840878,5.261592 0.624212,1.270041 2.67521,3.492613 2.630628,7.574884 -0.04461,4.0822665 -0.98091,6.8037874 -2.586039,9.0717077 -1.605128,2.26792732 -4.503272,3.9915518 -7.981044,4.0822737 -3.477778,0.090717 -5.707121,-2.17720666 -6.465096,-3.4472534 -0.757975,-1.270036 -1.070084,-3.9915518 -0.133761,-5.9419619 0.936325,-1.9504282 2.40769,-1.9504282 2.898147,-1.7689877 0.490455,0.181438 0.624213,0.4535811 0.891735,0.9525256 0.26752,0.4989447 0.44587,0.4082311 0.847161,0.1360795 0.401275,-0.2721541 0.535033,-0.5896654 0.445866,-0.9978916 -0.08917,-0.408231 -0.62422,-0.9071732 -1.070092,-1.0432502 -0.445865,-0.1360747 -1.070085,-0.5443017 -1.961822,-0.4082167 -0.891736,0.136065 -2.630623,0.5896548 -4.101988,2.585427 -1.471365,1.9957744 -1.29302,5.0801606 -0.401281,6.5316309 0.891737,1.45147531 2.586035,4.1729873 6.331332,5.1255217 3.745301,0.9525364 9.809105,-1.8597006 11.904684,-6.2141209 2.095577,-4.3544229 2.140168,-6.3955562 2.051001,-9.9788777 -0.08917,-3.583335 -3.254842,-8.935643 -6.777199,-10.886061 -3.522357,-1.950419 -6.152982,-3.084383 -8.872787,-2.630797 z"
+       style="fill:#ffc344;fill-opacity:1;stroke:none;stroke-width:0.0890379px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1012"
+       d="m 52.759546,-7.6807986 c 0,0 -0.882776,-0.833911 -1.670967,0.6414663 -0.788192,1.4753675 -1.166523,2.790373 -0.378332,4.3940472 0.78819,1.6036647 2.427624,2.56586017 4.949854,2.53379165 2.522203,-0.0321084 4.382334,-0.64146726 5.485801,-2.46964635 1.103472,-1.8281836 1.954712,-3.1752577 2.049297,-3.8487984 0.09459,-0.6735444 0.599029,0.096216 0.441394,0.6735407 -0.15764,0.5773125 -0.126112,1.6998816 0.315273,1.4753653 0.441388,-0.2245063 0.788195,-0.5773163 0.851243,-0.4169509 0.06306,0.1603616 -0.50444,1.154644 -0.772422,1.6517766 -0.267993,0.4971326 -1.103472,1.699893 -1.592156,2.16494892 -0.488669,0.46506666 -1.166517,1.1225704 -1.970475,1.6036691 C 59.664103,1.2035109 58.418766,1.7647989 57.725156,1.893092 57.031546,2.0213857 55.644328,2.2940039 54.856131,2.2619316 54.067946,2.2298548 53.059055,2.0855246 51.939826,1.5242442 50.820592,0.96296626 49.606778,0.0969782 49.133864,-0.76900099 48.66095,-1.6349808 47.935815,-2.4207789 48.093452,-4.6017617 c 0.15764,-2.1809854 0.86701,-3.3035574 1.40298,-3.8167243 0.53597,-0.5131766 1.32416,-0.7376922 1.844369,-0.6254295 0.520205,0.1122529 0.851246,0.4169555 0.977357,0.6414613 0.126107,0.224512 0.331042,0.6414675 0.441388,0.7216556 z"
+       style="fill:#f06767;fill-opacity:1;stroke:none;stroke-width:0.0890379px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1014"
+       d="m 60.767575,3.8655962 c 0,0 3.783317,-2.2130621 5.548864,-5.7090499 1.765551,-3.4959942 2.522214,-5.7411261 2.30152,-9.1729813 -0.220695,-3.431843 -0.756663,-1.731959 -0.157641,-3.207334 0.599026,-1.475377 -0.378328,-4.394049 0.03152,-4.586488 0.409861,-0.19244 1.292637,1.282934 1.544859,2.469649 0.252214,1.186712 1.355684,4.843067 0.472911,9.4937107 -0.882773,4.6506303 -2.963589,6.51088559 -4.350812,7.76175223 C 64.77157,2.1657114 61.618812,4.3467019 61.145898,4.314627 60.67298,4.2825186 60.609928,4.2825186 60.76756,3.8655962 Z"
+       style="fill:#3f62eb;fill-opacity:1;stroke:none;stroke-width:0.0890379px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1016"
+       d="m 53.957602,-2.8698091 c 0,0 2.017773,0.4490302 3.562621,-0.5131634 1.544859,-0.9622063 2.742913,-2.5337986 2.932073,-3.1431917 0.189165,-0.6093954 0.220697,0.5452465 0.441386,-0.032045 0.220692,-0.5773293 1.10347,-1.7319649 0.662081,-4.4261318 -0.441389,-2.694157 -0.472916,-2.822457 -1.292627,-4.265758 -0.819727,-1.443301 -2.774446,-3.431845 -3.972493,-4.073313 -1.198047,-0.641466 -2.86901,-1.603666 -5.170538,-1.53952 -2.301517,0.06415 -1.544853,-0.09622 -3.751788,0.288661 -2.206938,0.384879 -4.193179,1.4433 -4.855258,2.02062 -0.66208,0.577321 -2.427629,2.148917 -3.058183,3.014896 -0.630554,0.865981 -2.364573,2.822454 -3.278875,5.5486918 -0.914302,2.7262327 -1.292635,3.0148925 -1.35569,4.8109998 -0.06306,1.7961094 0.157637,2.2772018 -0.220692,2.4375779 -0.378332,0.1603616 -0.315277,-1.3470823 -0.283751,-2.4055093 0.03153,-1.0584128 0.03153,-3.8167249 1.418745,-6.8957642 1.387216,-3.079043 3.846373,-5.644912 5.23359,-6.575039 1.387216,-0.930126 2.995127,-2.180987 5.485811,-2.790382 2.490685,-0.609392 4.981368,-0.513172 6.526228,-0.224513 1.544859,0.288661 3.94096,1.282935 5.23359,2.277208 1.292636,0.994275 2.711385,2.213062 3.78332,4.20161 1.07194,1.988545 1.355684,4.522341 1.324159,5.5807587 -0.03152,1.0584266 -0.567498,3.4960027 -1.387216,4.6827127 -0.819721,1.186715 -1.923185,2.597942 -3.05818,3.1111149 -1.135,0.5131697 -2.522222,0.6735396 -3.657204,0.1603641 C 54.08371,-2.132102 54.146768,-2.3245385 53.957602,-2.869785 Z"
+       style="fill:#fce102;fill-opacity:1;stroke:none;stroke-width:0.0890379px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1018"
+       d="m 53.957602,-2.8698091 c 0,0 1.597697,0.4513829 2.946439,-0.1609516 1.348754,-0.6123403 1.850358,-1.2020043 2.173613,-1.5535277 0.323251,-0.3515343 0.936324,-1.0092338 1.103526,-1.3154017 0.167198,-0.3061663 0.345542,-0.4876031 0.345542,-0.6009978 0,-0.1133983 -0.312104,-0.3855536 -0.01112,-1.043249 0.300955,-0.6576966 0.568485,-2.1658733 0.434721,-2.8462471 -0.133762,-0.680377 -0.445868,-4.456482 -3.121079,-6.973885 -2.675203,-2.517401 -5.328127,-2.81223 -5.328127,-2.81223 0,0 4.235756,1.338077 6.219869,5.397669 1.984117,4.059596 1.337601,6.66771 0.06688,8.2552586 -1.270724,1.5875487 -3.076491,1.7689868 -3.566953,1.3607558 -0.490444,-0.4082292 -1.501077,1.8641068 -1.26328,2.2928065 z"
+       style="fill:#5ed938;fill-opacity:1;stroke:none;stroke-width:0.0890379px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1020"
+       d="m 48.800383,-17.432105 c 0,0 -2.853557,-0.02267 -5.01602,1.406112 -2.16246,1.428797 -3.210252,2.585441 -3.812175,3.492612 -0.601919,0.907174 -1.293016,2.154531 -1.203842,2.131854 0.08917,-0.0227 2.60833,-3.53797 4.57015,-4.445139 1.961822,-0.907173 3.923641,-2.177213 6.621146,-1.247366 2.697505,0.929857 3.968232,2.222571 4.547859,1.905065 0.579629,-0.31751 0.691101,-0.70306 0.356697,-1.133966 -0.334399,-0.430906 -2.697508,-2.540081 -6.063815,-2.109172 z"
+       style="fill:#8fdbe9;fill-opacity:1;stroke:none;stroke-width:0.0890379px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1022"
+       d="m 44.530829,0.69033794 c 0.189165,0.0962163 1.607908,2.56586906 2.742905,2.98282056 1.134994,0.4169541 1.891657,0.4490201 2.017767,0.6414685 0.126111,0.192439 0.09459,1.1546409 1.103469,1.5716019 1.008886,0.4169522 5.738036,1.7319552 7.09372,1.8602476 1.355695,0.1282956 0.2207,0.9301201 1.040416,1.2187811 0.819723,0.2886654 4.319291,0.4490282 5.170539,0.096218 0.851247,-0.3528 0.851247,0.3207371 -0.630553,0.8980604 -1.481799,0.577316 -5.391228,1.956476 -7.944967,1.635743 C 52.570379,11.274546 49.543723,10.729296 47.84123,9.5105098 46.138737,8.2917237 45.413601,7.7464765 46.044154,7.6502577 c 0.630553,-0.096225 2.30152,1.6998841 3.026654,1.8923257 0.725137,0.1924358 1.324162,0.1924358 0.882773,-0.2565932 C 49.512197,8.8369677 46.64318,6.8484212 46.359433,6.9446376 46.075682,7.0408596 45.476656,7.1050004 44.972214,6.4314646 44.467772,5.7579276 41.819449,2.0374171 41.977086,0.04887194 42.134727,-1.9396732 42.63917,-1.4265066 43.238195,-0.6888129 c 0.599024,0.73768484 1.292634,1.37915084 1.292634,1.37915084 z"
+       style="fill:#fd7aff;fill-opacity:1;stroke:none;stroke-width:0.0890379px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:1.28957px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.0322394"
+       x="80.617455"
+       y="4.5832744"
+       id="text24207"><tspan
+         sodipodi:role="line"
+         id="tspan24205"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:49.4338px;font-family:Yukarimobile;-inkscape-font-specification:'Yukarimobile, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#1d2129;fill-opacity:1;stroke-width:0.0322394"
+         x="80.617455"
+         y="4.5832744">spark</tspan></text>
+  </g>
+</svg>
--- a/assets/spark-store.png
+++ b/assets/spark-store.png
--- a/assets/spark-store.xcf
+++ b/assets/spark-store.xcf
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,27 @@
-spark-store (3.0.3-14) stable; urgency=medium
+spark-store (3.1.2) stable; urgency=medium

-  * Add pkexec policy: ssinstall
-  * Modify ssinistall script: Now will refuse run when no args are given or not run as root.
+  * Now let apt-fast method support all mirrors
+  * Now will download dependencies and upgrade with all mirrors
+
+ -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
+
+
+
+
+spark-store (3.1.1) stable; urgency=medium
+
+  * Now will delete the link of policy file after uninstall or upgrade
+  * Now ss-update-controler will create symbol link instead of hard link
+
+ -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
+
+
+
+
+spark-store (3.1.0) stable; urgency=medium
+
+  * Add pkexec policy: ssinstall. Only will be enabled after permitted.
+  * Modify ssinistall script: Now will ask for password when not run as root

 -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800

--- a/debian/control
+++ b/debian/control
@@ -29,12 +29,13 @@ Depends:${shlibs:Depends}, ${misc:Depends},
 libqt5widgets5,
 libqt5network5,
 libqt5concurrent5,
- libdtkcore5(>=5.2),
- libdtkgui5(>=5.2),
- libdtkwidget5(>=5.2),
+ libdtkcore5,
+ libdtkgui5,
+ libdtkwidget5,
 libnotify4,
 curl,
- dde-qt5integration
+ dde-qt5integration,
+ bubblewrap
 Description: Spark Store
 A community powered app store, based on DTK.
 Recommends: apt-fast
--- a/debian/spark-store.postinst
+++ b/debian/spark-store.postinst
@@ -11,6 +11,7 @@ case "$1" in
 		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
+		ln -s -f /opt/durapps/spark-store/bin/ss-apt-fast /usr/local/bin/ss-apt-fast



--- a/debian/spark-store.prerm
+++ b/debian/spark-store.prerm
@@ -6,6 +6,7 @@ rm /usr/local/bin/ssinstall
 rm /usr/local/bin/spark-dstore-patch
 rm /usr/local/bin/ussinstall
 rm /usr/local/bin/ussremove
+rm /usr/local/bin/ss-apt-fast

 # Remove residual symbol links to stop upgrade detect if exist
 if [ -f /etc/xdg/autostart/spark-update-notifier.desktop ];then
@@ -20,9 +21,14 @@ systemctl disable spark-update-notifier



-# Clean the service place file
+# Clean the update-number service place file if exist
 if [ -d "/tmp/spark-store-updatenum/" ] ; then
-	rm -rf /tmp/spark-store-updatenum/s
+	rm -rf /tmp/spark-store-updatenum/
+fi
+
+# Clean the auto install polkit file if exist
+if [ -f "/usr/share/polkit-1/actions/store.spark-app.ssinstall.policy" ] ; then
+	rm /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
 fi

 # Remove gpg key file
--- a/spark-store-project.pro
+++ b/spark-store-project.pro
@@ -37,6 +37,7 @@ polkit-1.files +=pkg/usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
 polkit-1.path = /usr/share/polkit-1/actions/


+
 icon.files += pkg/usr/share/icons/hicolor/scalable/apps/spark-store.svg
 icon.path = /usr/share/icons/hicolor/scalable/apps

--- a/src/downloadlist.cpp
+++ b/src/downloadlist.cpp
@@ -71,7 +71,7 @@ void downloadlist::setValue(qint64 value)
    ui->label_2->setText(QString::number(double(value) / 100) + "% (" + speed + ")");
    if(ui->label_2->text().left(4) == "100%")
    {
-        ui->label_2->setText(tr("Downloaded, waiting to install"));
+        ui->label_2->setText(tr("Downloaded. Open APP Upgrade and Install Settings to enable password-free installation"));
    }
 }

--- a/src/main.cpp
+++ b/src/main.cpp
@@ -30,7 +30,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.1"));
+      dialog.setVersion(DApplication::buildVersion("Version 3.1.2"));
      dialog.setProductIcon(QIcon::fromTheme("spark-store"));  // 设置Logo
      dialog.setProductName(QLabel::tr("Spark Store"));
      dialog.setDescription(
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
                      )
                  );
      dialog.setProductName(QLabel::tr("Spark Store"));
-      dialog.setCompanyLogo(QPixmap(":/Logo-Spark.png"));
+      dialog.setCompanyLogo(QPixmap(":/spark-store.png"));
      dialog.setWebsiteName(QObject::tr("The Spark Project"));
      dialog.setWebsiteLink("https://gitee.com/deepin-community-store");
     
@@ -51,7 +51,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.1"));
+    a.setApplicationVersion(DApplication::buildVersion("3.1.2"));
    a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
    a.setApplicationDescription(
                QObject::tr(
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -192,7 +192,7 @@ void Widget::initUI()
    // 添加菜单项
    QAction *actionSubmission = new QAction(tr("Submit App"), this);
    QAction *setting = new QAction(tr("Settings"));
-    QAction *upgrade = new QAction(tr("App Upgrade"));
+    QAction *upgrade = new QAction(tr("APP Upgrade and Install Settings"));

    QMenu *menu = new QMenu;
    menu->addAction(setting);
--- a/src/workerthreads.cpp
+++ b/src/workerthreads.cpp
@@ -29,7 +29,7 @@ void SpkAppInfoLoaderThread::run()

        QString deburl = serverUrl;
        deburl = deburl.left(urladdress.length() - 1);
-        urladdress = "https://img.jerrywang.top/";  // 使用图片专用服务器请保留这行，删除后将使用源服务器
+        urladdress = "https://d.store.deepinos.org.cn/";  // 使用图片专用服务器请保留这行，删除后将使用源服务器
        urladdress = urladdress.left(urladdress.length() - 1);

        for(int i = 3; i < downloadurl.size(); i++)
--- a/tool/apt-fast-conf/apt-fast.conf
+++ b/tool/apt-fast-conf/apt-fast.conf
@@ -0,0 +1,147 @@
+###################################################################
+# CONFIGURATION OPTIONS
+###################################################################
+# Every item has a default value besides MIRRORS (which is unset).
+
+# Use aptitude, apt-get, or apt?
+# Note that apt-get is used as a fallback for outputting the
+# package URI list for e.g. aptitude, which can't do this
+# Optionally add the FULLPATH to apt-get or apt-rpm or aptitude
+# e.g. /usr/bin/aptitude
+#
+# Default: apt-get
+#
+_APTMGR=apt
+
+
+# Enable DOWNLOADBEFORE to suppress apt-fast confirmation dialog and download
+# packages directly.
+#
+# Default: dialog enabled
+#
+DOWNLOADBEFORE=true
+
+
+# Choose mirror list to speed up downloads from same archive. To select some
+# mirrors take a look at your distribution's archive mirror lists.
+# Debian: http://www.debian.org/mirror/list
+# Ubuntu: https://launchpad.net/ubuntu/+archivemirrors
+#
+# It is required to add mirrors in the sources.list to this array as well, so
+# apt-fast can destinguish between different distributions.
+#
+# Examples:
+#
+# Different distributions (as in operating systems):
+#
+# sources.list:
+# deb http://deb.debian.org/debian/ unstable main non-free contrib
+# deb http://de.archive.ubuntu.com/ubuntu/ bionic main universe
+#
+# apt-fast.conf:
+# MIRRORS=( 'http://deb.debian.org/debian','http://ftp.debian.org/debian,http://ftp2.de.debian.org/debian,http://ftp.de.debian.org/debian,ftp://ftp.uni-kl.de/debian'
+#           'http://archive.ubuntu.com/ubuntu,http://de.archive.ubuntu.com/ubuntu,http://ftp.halifax.rwth-aachen.de/ubuntu,http://ftp.uni-kl.de/pub/linux/ubuntu,http://mirror.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/' )
+#
+#
+# Single distribution:
+#
+# sources.list:
+# deb http://fr.archive.ubuntu.com/ubuntu/ bionic main
+# deb http://fr.archive.ubuntu.com/ubuntu/ artful main
+#
+# apt-fast.conf:
+# MIRRORS=( 'http://fr.archive.ubuntu.com/ubuntu,http://bouyguestelecom.ubuntu.lafibre.info/ubuntu,http://mirror.ovh.net/ubuntu,http://ubuntu-archive.mirrors.proxad.net/ubuntu' )
+#
+# Default: disabled
+#
+MIRRORS=( 'https://d.store.deepinos.org.cn/,https://d1.store.deepinos.org.cn/,https://d2.store.deepinos.org.cn/,https://d3.store.deepinos.org.cn/,https://d4.store.deepinos.org.cn/,https://d5.store.deepinos.org.cn/' )
+
+
+# Maximum number of connections
+# You can use this value in _DOWNLOADER command. Escape with ${}: ${_MAXNUM}
+#
+# Default: 5
+#
+_MAXNUM=5
+
+
+# Maximum number of connections per server
+# Default: 10
+#
+_MAXCONPERSRV=10
+
+
+# Download file using given number of connections
+# If more than N URIs are given, first N URIs are used and remaining URIs are used for backup.
+# If less than N URIs are given, those URIs are used more than once so that N connections total are made simultaneously.
+#
+_SPLITCON=8
+
+
+# Split size i.e. size of each piece
+# Possible Values: 1M-1024M
+#
+_MINSPLITSZ=1M
+
+
+# Piece selection algorithm to use
+# Available values are: default, inorder, geom
+# default: selects piece so that it reduces the number of establishing connection, reasonable for most cases
+# inorder: selects pieces in sequential order starting from first piece
+# geom: selects piece which has minimum index like inorder, but it exponentially increasingly keeps space from previously selected pieces
+#
+_PIECEALGO=default
+
+
+# Downloadmanager listfile
+# You can use this value in _DOWNLOADER command. Escape with ${}: ${DLLIST}
+#
+# Default: /tmp/apt-fast.list
+#
+DLLIST='/tmp/apt-fast.list'
+
+
+# Download command to use. Temporary download list is designed for aria2. But
+# you can choose another download command or download manager. It has to
+# support following input file syntax (\t is tab character):
+#
+# # Comment
+# MIRROR1\tMIRROR2\tMIRROR3...
+#  out=FILENAME1
+# MIRROR1\tMIRROR2\tMIRROR3...
+#  out=FILENAME2
+# ...
+#
+# Examples:
+# aria2c with a proxy (set username, proxy, ip and password!)
+# _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} --http-proxy=http://username:password@proxy_ip:proxy_port -i ${DLLIST}'
+#
+# Default: _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0'
+#
+_DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0'
+
+
+# Download temp folder for Downloadmanager
+# example /tmp/apt-fast. Standard is /var/cache/apt-fast
+#
+# Default: /var/cache/apt/apt-fast
+#
+DLDIR='/var/cache/apt/apt-fast'
+
+
+# APT archives cache directory
+#
+# Default /var/cache/apt/archives
+# (APT configuration items Dir::Cache and Dir::Cache::archives)
+#
+APTCACHE='/var/cache/apt/archives'
+
+
+# apt-fast colors
+# Colors are disabled when not using a terminal.
+#
+# Default colors are:
+#  cGreen='\e[0;32m'
+#  cRed='\e[0;31m'
+#  cBlue='\e[0;34m'
+#  endColor='\e[0m'
--- a/pkg/usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
+++ b/pkg/usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
--- a/tool/password-check/ss-certificate-passwd
+++ b/tool/password-check/ss-certificate-passwd
@@ -3,9 +3,15 @@ uname=`whoami`
 	echo "Now input the password of $uname"
 	read upass
 	passcheck=`echo "$upass" | sudo -S echo "i love amber forever"`
+	passcheck=`echo "$upass" | sudo -S echo "i love amber forever"`
+	reset
+	###UOS魔改的sudo返回了验证成功干扰判断，会变成验证成功i love amber forever
+	### 听我说谢谢你，因为有你，温暖了四季
+	###fuck♂you 就不能改的不那么坑爹吗？？？还是我用来捕捉的方法太笨了。。。
 	if [ "$passcheck" != "i love amber forever" ];then
 	echo "114514首"
 	exit 1	
 	else
+	reset 
 	echo "go go Baron Bunny"	
 	fi
--- a/tool/ss-apt-fast
+++ b/tool/ss-apt-fast
@@ -0,0 +1,8 @@
+#/bin/bash
+DEPEND=`dpkg -l | grep  apt-fast`
+if [ "$DEPEND" = "" ] ; then 
+echo "未安装依赖：apt-fast 本脚本退出"
+exit 0
+fi
+
+sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/apt-fast.conf' /etc/apt-fast.conf apt-fast "$@"
--- a/tool/ssinstall
+++ b/tool/ssinstall
@@ -63,13 +63,13 @@ fi
 if [ "$DEPEND" != "" ]  && [ "$isuos" != "" ]; then
 echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast"
 echo ----------------------------------------------------------------------------------
-dpkg -i $1 || apt install -yf || dpkg -P $1
+echo "$upass" | sudo -S dpkg -i $1 || apt install -yf || dpkg -P $1
 fi

 if  [ "$DEPEND" != "" ]  && [ "$isuos" = "" ]; then
-echo "检测到apt-fast，使用apt-fast进行多线程下载加速"
+echo "检测到apt-fast，使用ss-apt-fast进行多线程下载加速"
 echo ----------------------------------------------------------------------------------
-echo "$upass" | sudo -S dpkg -i $1 || apt-fast install -yf || dpkg -P $1
+echo "$upass" | sudo -S dpkg -i $1 || ss-apt-fast install -yf || dpkg -P $1
 fi

 echo "$upass" | sudo -S sed -i 's/500/400/g' /etc/apt/preferences.d/sparkstore
@@ -99,9 +99,9 @@ dpkg -i $1 || apt install -yf || dpkg -P $1
 fi

 if  [ "$DEPEND" != "" ]  && [ "$isuos" = "" ]; then
-echo "检测到apt-fast，使用apt-fast进行多线程下载加速"
+echo "检测到apt-fast，使用ss-apt-fast进行多线程下载加速"
 echo ----------------------------------------------------------------------------------
-dpkg -i $1 || apt-fast install -yf || dpkg -P $1
+dpkg -i $1 || ss-apt-fast install -yf || dpkg -P $1
 fi

 sed -i 's/500/400/g' /etc/apt/preferences.d/sparkstore
--- a/tool/update-upgrade/ss-do-upgrade.sh
+++ b/tool/update-upgrade/ss-do-upgrade.sh
@@ -5,5 +5,5 @@ echo "没有安装apt-fast，使用apt运行"
 sudo apt upgrade -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
 else
 echo "已安装apt-fast，使用apt-fast加速运行"
-sudo apt-fast upgrade -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
+ss-apt-fast upgrade -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
 fi
--- a/tool/update-upgrade/ss-update-controler.sh
+++ b/tool/update-upgrade/ss-update-controler.sh
@@ -1,9 +1,48 @@
 #!/bin/bash
-set -e
-echo "因为目前没有有时间的Qt程序员志愿者所以现在加功能只有让shenmo写脚本了..."
+
+reset
+
+endloop=0
+
+#####################检测是否启动过了更新检测工具
+while [ $endloop -eq 0 ] ;do
+
+if [  -f /etc/xdg/autostart/spark-update-notifier.desktop ];then 
+text_update_open="关闭"
+#已经开启了就显示关闭
+else
+text_update_open="开启"
+fi
+
+if [  -f /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy ];then 
+text_auto_install_open="关闭"
+#已经开启了就显示关闭
+else
+text_auto_install_open="开启"
+fi
+
+
+echo "欢迎使用星火更新和安装设置工具"
+echo "请在以下操作中选择一个进行~"
+echo "输入0 查看自动更新相关功能使用前须知（重要）"
+echo "输入1 $text_update_open星火更新检测工具(如果开启则会在系统启动后自动检测更新。如有更新则会弹出通知)"
+echo "输入2 查看可更新软件包列表并决定是否更新"
+echo "输入3 $text_auto_install_open点击安装免输入密码功能"
+echo "输入4 退出脚本"
 echo
-echo "此功能被添加的原因是：为了防止影响系统更新，星火源默认的优先级是400，低于默认的500。这导致了与系统仓库相同包名的软件包无法正常更新到比系统仓库更高的版本。例如：hugo，系统仓库中的低版本会被优先安装，而且默认不会更新到星火的更新的版本"
-echo "此脚本可以检测星火源中是否有比当前系统更高版本的软件包，由您决定是否安装"
+echo "小提示：建议安装apt-fast以提高下载速度。"
+echo "安装过apt-fast的用户可在系统更新的时候使用ss-apt-fast代替apt-fast进行更新"
+echo "比如 sudo ss-apt-fast update或者sudo ss-apt-fast upgrade"
+echo 
+echo "UOS除外：UOS对下载源采取了禁止非APT应用多线程下载的策略"
+echo "为了防止系统依赖包无法下载，在依赖下载时禁用了apt-fast."
+read option
+
+case $option in 
+	0)
+	reset
+	echo "此须知适用于自动更新功能"
+	echo "此脚本可以检测星火源中是否有比当前系统更高版本的软件包，由您决定是否安装；在安装更新过程中请不要直接点击关闭本页面，以免发生错误"
 	echo "此脚本使用apt update/apt list --upgrade/apt upgrade来更新软件源、列出更新列表和操作更新"
 	echo
 	echo "该脚本不对其使用效果有任何明示或暗示的担保，在使用前请您确保您清楚地知道您在干什么。您应当清楚，星火商店的软件包并不是适配所有发行版的；尽管绝大多数的软件更新是无害的，您仍然应该仔细检查显示出来的更新内容，以确保不会对您	的依赖环境造成破坏，尤其是那些看起来和系统依赖相关的软件包。在查看过更新列表之后，确认更新之前，您仍有一次取消更新的机会。"
@@ -14,59 +53,72 @@ echo
 	echo "请按回车继续..."
 #"只有回车可以用啊！""啊？"“你说的任意都行啊”“唔。。。戳到我的盲区了”
 	read
-
 	reset
-
-endloop=0
-
-
-while [ $endloop -eq 0 ] ;do
-
-if [  -f /etc/xdg/autostart/spark-update-notifier.desktop ];then 
-textupdateopen="关闭"
-#已经开启了就显示关闭
-else
-textupdateopen="开启"
-fi
-
-echo "欢迎使用星火更新工具 脚本版 "
-echo "请在以下操作中选择一个进行~"
-echo "输入1 $textupdateopen星火更新检测工具(如果开启则会在系统启动后自动检测更新。如有更新则会弹出通知)"
-echo "输入2 查看可更新软件包列表并决定是否更新"
-echo "输入3 退出脚本"
-read option
-
-case $option in 
+	;;
 	1)
 	echo "执行以下操作需要授权..."
 	if [  -f /etc/xdg/autostart/spark-update-notifier.desktop ];then 
-	echo "检测到已经启动了自动更新检测，关闭中"
+	echo "---检测到已经启动了自动更新检测，执行关闭"
 	sudo systemctl disable spark-update-notifier
 	sudo rm /etc/xdg/autostart/spark-update-notifier.desktop
-	
+	sleep 3
+	reset
 	else
-	echo "未检测到自动更新检测，启动中"
+	echo "---未检测到自动更新检测，执行启动"
 	sudo systemctl enable spark-update-notifier
 	sudo service spark-update-notifier start
 #	ln -s /opt/durapps/spark-store/bin/update-upgrade/autostart/spark-update-notifier.desktop $XDG_CONFIG_HOME/autostart
 #	
 	sudo ln -s /opt/durapps/spark-store/bin/update-upgrade/autostart/spark-update-notifier.desktop /etc/xdg/autostart
 	/opt/durapps/spark-store/bin/update-upgrade/ss-update-notify.sh now
+	sleep 3
+	reset
 	fi
 	;;

 	2)
+	echo "请注意：如果有些更新需要从系统获取更多依赖，你将需要手动操作 sudo ss-apt-fast upgrade"
 	echo "执行以下操作需要授权..."
 	/opt/durapps/spark-store/bin/update-upgrade/ss-upgrade-list.sh
 	/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh
-
+	echo "---请按回车返回"
+	read
+	reset
 	;;
 	3)
-	echo "按回车退出"
+	if [ -f /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy ];then 
+	echo "---检测到已经启动了免输入密码，执行关闭"
+	sudo rm /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
+	sleep 3
+	reset
+	else
+
+cat << EOF
+请注意：这个功能尚未开发完成，一旦开启，则运行pkexec ssinstall时不再需要授权
+仅对星火内置安装器生效
+理论上会存在一定的安全风险~
+如果接受，请输入1，否则输入2
+EOF
+read is_accept_polkiy
+
+if [ "$is_accept_polkiy" = "1" ];then
+	echo "执行以下操作需要授权..."
+	sudo ln -s /opt/durapps/spark-store/bin/auto-install-policy/store.spark-app.ssinstall.policy /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
+	echo "---已启动"
+	sleep 3
+	reset
+	else
+	echo "---未同意，返回"
+	sleep 3
+	reset
+fi
+fi
+	;;
+	4)
 	exit 0
 	;;
 	*) 
-	echo "无法识别的输入！请重新输入"
+	echo "---无法识别的输入！请重新输入"
 	reset
 esac

--- a/tool/update-upgrade/ss-upgrade-list.sh
+++ b/tool/update-upgrade/ss-upgrade-list.sh
@@ -2,5 +2,5 @@
 set -e


-echo "可更新的应用有："
+echo "---可更新的应用有："
 sudo apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
--- a/translations/spark-store_en.ts
+++ b/translations/spark-store_en.ts
@@ -447,6 +447,11 @@
        <source>Settings</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <location filename="../src/widget.cpp" line="195"/>
+        <source>APP Upgrade and Install Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
    <message>
        <location filename="../src/widget.cpp" line="344"/>
        <source>Not Exist</source>
@@ -472,11 +477,6 @@
        <source>Failed to get the name to the file to be downloaded.</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <location filename="../src/widget.cpp" line="195"/>
-        <source>App Upgrade</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <location filename="../src/widget.cpp" line="900"/>
        <source>Upgrade</source>
@@ -582,7 +582,7 @@
    </message>
    <message>
        <location filename="../src/downloadlist.cpp" line="74"/>
-        <source>Downloaded, waiting to install</source>
+        <source>Downloaded. Open APP Upgrade and Install Settings to enable password-free installation</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
--- a/translations/spark-store_fr.ts
+++ b/translations/spark-store_fr.ts
@@ -629,6 +629,11 @@ Nous sommes nés pour le changement.</translation>
        <source>Settings</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <location filename="../src/widget.cpp" line="195"/>
+        <source>APP Upgrade and Install Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
    <message>
        <location filename="../src/widget.cpp" line="344"/>
        <source>Not Exist</source>
@@ -645,11 +650,6 @@ Nous sommes nés pour le changement.</translation>
        <source>Failed to get the name to the file to be downloaded.</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <location filename="../src/widget.cpp" line="195"/>
-        <source>App Upgrade</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <location filename="../src/widget.cpp" line="706"/>
        <source>Relative apps Not Found!</source>
@@ -776,7 +776,7 @@ Nous sommes nés pour le changement.</translation>
    </message>
    <message>
        <location filename="../src/downloadlist.cpp" line="74"/>
-        <source>Downloaded, waiting to install</source>
+        <source>Downloaded. Open APP Upgrade and Install Settings to enable password-free installation</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
--- a/translations/spark-store_zh_CN.ts
+++ b/translations/spark-store_zh_CN.ts
@@ -505,8 +505,8 @@
    </message>
    <message>
        <location filename="../src/widget.cpp" line="195"/>
-        <source>App Upgrade</source>
-        <translation type="unfinished"></translation>
+        <source>APP Upgrade and Install Settings</source>
+        <translation>应用更新和安装设置</translation>
    </message>
    <message>
        <location filename="../src/widget.cpp" line="344"/>
@@ -728,9 +728,8 @@ Click yes to continue.</source>
        <translation>深度软件包安装器</translation>
    </message>
    <message>
-        <location filename="../src/downloadlist.cpp" line="74"/>
        <source>Downloaded, waiting to install</source>
-        <translation>已完成，等待安装</translation>
+        <translation type="vanished">已完成，等待安装</translation>
    </message>
    <message>
        <location filename="../src/downloadlist.cpp" line="100"/>
@@ -756,6 +755,11 @@ Click yes to continue.</source>
        <source>Installing...</source>
        <translation type="obsolete">正在安装</translation>
    </message>
+    <message>
+        <location filename="../src/downloadlist.cpp" line="74"/>
+        <source>Downloaded. Open APP Upgrade and Install Settings to enable password-free installation</source>
+        <translation type="unfinished">下载完成 可进入应用更新和安装设置来启动免密码安装</translation>
+    </message>
    <message>
        <location filename="../src/downloadlist.cpp" line="190"/>
        <source>Finish</source>
Author	SHA1	Message	Date
shenmo	f8dbca8f6f	!42 3.1.2 Merge pull request !42 from shenmo/master	2022-06-21 14:58:37 +00:00
shenmo	a064b7b534	修改： debian/changelog 修改： debian/control 修改： debian/spark-store.postinst 修改： debian/spark-store.prerm 修改： spark-store-project.pro 修改： src/main.cpp 新文件： tool/apt-fast-conf/apt-fast.conf 新文件： tool/ss-apt-fast 修改： tool/ssinstall 修改： tool/update-upgrade/ss-do-upgrade.sh 修改： tool/update-upgrade/ss-update-controler.sh	2022-06-21 22:37:39 +08:00
shenmo	289f3020fe	!41 不再case yoyo Merge pull request !41 from shenmo/master	2022-06-16 05:31:51 +00:00
shenmo	9cd974fed9	不再case yoyo	2022-06-16 05:31:05 +00:00
shenmo	4d97a1e87b	!40 检测yoyo-daemon Merge pull request !40 from 柚子/N/A	2022-06-10 10:33:15 +00:00
柚子	d326e8919f	检测yoyo-daemon	2022-06-10 10:32:33 +00:00
Jerry	1828a60ff1	!39 update img url * fix: update img url	2022-06-07 10:54:26 +00:00
shenmo	865322c85f	!37 修改controler的文案 Merge pull request !37 from shenmo/master	2022-05-15 02:46:38 +00:00
shenmo	c22c76efc2	update tool/update-upgrade/ss-update-controler.sh.	2022-05-15 02:45:19 +00:00
shenmo	415dd1a63c	!36 update tool/update-upgrade/ss-upgrade-list.sh. Merge pull request !36 from lv36/N/A	2022-05-15 02:40:01 +00:00
lv36	7e105b59b0	update tool/update-upgrade/ss-upgrade-list.sh. 接对ss-update-controler.sh的修改，微调了输出的显示，个人认为这样可加强字符显示的对比，增强显示的对比、提醒（自己看着更舒服）	2022-05-14 15:06:41 +00:00
shenmo	84b3340687	update README.md.	2022-05-11 14:43:24 +00:00
shenmo	2da576aeab	update README.zh.md.	2022-05-11 14:38:51 +00:00
shenmo	fb94448692	update README.zh.md.	2022-05-11 14:38:29 +00:00
shenmo	6ba7601efa	update README.zh.md.	2022-05-11 14:37:49 +00:00
shenmo	4ea6c90e78	update README.md.	2022-05-11 14:37:03 +00:00
shenmo	f3633bb19d	add README.md.	2022-05-11 14:36:14 +00:00
shenmo	090b9a279f	重命名 README.md 为 README.zh.md	2022-05-11 14:25:08 +00:00
shenmo	1bf8a57802	3.1.1	2022-05-10 12:19:16 +00:00
shenmo	01f2610e0a	update debian/changelog.	2022-05-10 12:18:36 +00:00
shenmo	3e3c3140d0	update tool/update-upgrade/ss-update-controler.sh.	2022-05-10 12:16:34 +00:00
shenmo	6ca024b6f3	清理policy和update number文件	2022-05-09 16:42:13 +00:00
shenmo	c0ea5824b1	修改： debian/changelog	2022-05-09 18:37:08 +08:00
shenmo	ee60b2e7f6	修改： debian/changelog	2022-05-09 18:36:49 +08:00
shenmo	53ae863823	修改： tool/password-check/ss-certificate-passwd	2022-05-09 01:00:11 +08:00
shenmo	3dae7db89a	修复UOS且apt-fast下的提权错误	2022-05-08 15:40:15 +00:00
shenmo	3b3bf8f0de	修改： src/downloadlist.cpp 修改： src/widget.cpp 重命名： pkg/usr/share/polkit-1/actions/store.spark-app.ssinstall.policy -> tool/auto-install-policy/store.spark-app.ssinstall.policy 修改： tool/update-upgrade/ss-update-controler.sh 修改： translations/spark-store_en.ts 修改： translations/spark-store_fr.ts 修改： translations/spark-store_zh_CN.ts	2022-05-08 23:11:42 +08:00
shenmo	00f9b62b80	修改： debian/changelog	2022-05-08 22:24:03 +08:00
shenmo	0916a0a97e	!34 修改control/修改logo * 删除： assets/Logo-Spark.png * update src/main.cpp. * The font used for new logo * new logo file * update debian/control.	2022-05-08 14:21:50 +00:00
Jerry	c6505c1c14	update readme	2022-05-03 09:13:29 +00:00