From aff593eba8e2d3813e53a23cfb73c0a35a6ea6d5 Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Tue, 20 Sep 2022 04:12:29 +0000
Subject: [PATCH 01/11] =?UTF-8?q?!115=203.2.2=20=E5=90=AF=E5=8A=A8=20*=20u?=
 =?UTF-8?q?pdate=20debian/changelog.=20*=20download=E5=8F=AF=E6=97=A0root?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=EF=BC=8C=E7=9B=B8=E5=BA=94=E7=9A=84=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E8=87=AA=E5=8A=A8=E5=88=B0=E6=9C=80=E6=96=B0?=
 =?UTF-8?q?=20*=20!114=20feat:=20GPU=20enable=20*=20aptss=20will=20now=20r?=
 =?UTF-8?q?efresh=20the=20system=20source=20before=20doing=20install,=20do?=
 =?UTF-8?q?wnloa=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/changelog |  7 +++++++
 src/main.cpp     |  8 ++++++--
 tool/aptss       | 42 +++++++++++++++++++++++++++++++++++-------
 tool/ssinstall   |  4 ++--
 4 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8938191..8a72289 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+spark-store (3.2.2) stable; urgency=medium
+
+  * aptss will now refresh the system source before doing install,  policy....etc
+  * 启动客户端GPU加速支持
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 spark-store (3.2.1) stable; urgency=medium
 
   * 更改刷新系统源的功能
diff --git a/src/main.cpp b/src/main.cpp
index 7b29aeb..5aacfdb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -13,6 +13,10 @@ int main(int argc, char *argv[])
     DApplication::loadDXcbPlugin();  // 已废弃，但是对于非deepin桌面可以正常使用标题栏
     DApplication::setAttribute(Qt::AA_EnableHighDpiScaling);    // 开启 Hidpi 支持
     // 程序内强制添加"-platformtheme deepin"参数喂给Qt让Qt正确使用Deepin主题修复各种奇怪样式问题
+
+    // 浏览器开启 GPU 支持
+    qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blacklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode");
+    
     QVector<char*> fakeArgs(argc + 2);
     fakeArgs[0] = argv[0];
     fakeArgs[1] = "-platformtheme";
@@ -30,7 +34,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.2.1"));
+      dialog.setVersion(DApplication::buildVersion("Version 3.2.2"));
       dialog.setProductIcon(QIcon::fromTheme("spark-store"));  // 设置Logo
       dialog.setProductName(QLabel::tr("Spark Store"));
       dialog.setDescription(
@@ -51,7 +55,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.2.1"));
+    a.setApplicationVersion(DApplication::buildVersion("3.2.2"));
     a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
     a.setApplicationDescription(
                 QObject::tr(
diff --git a/tool/aptss b/tool/aptss
index 7c2ddbd..e246557 100755
--- a/tool/aptss
+++ b/tool/aptss
@@ -1,11 +1,5 @@
 #/bin/bash
 
-
-
-
-
-if  [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] || [ "$1" = "download" ] ; then
-
 if [ ! -e "/tmp/aptss-conf/apt-fast.conf" ];then
 ###刷新apt-fast配置
 mkdir -p /tmp/aptss-conf/
@@ -17,10 +11,35 @@ chmod -R 755 /tmp/aptss-conf
 
 fi
 
+
+
+
+
+
+
+
+if  [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] ; then
+
 DEPEND=`which  apt-fast`
 if [ "$DEPEND" = "" ] ; then 
 echo "未安装依赖：apt-fast 开始安装"
-sudo aptss ssupdate && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y
+aptss ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y 
+fi
+
+sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"  -o Dir::etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
+
+###执行
+bwrap --dev-bind / / \
+                   --bind '/tmp/aptss-conf/apt-fast.conf' /etc/apt-fast.conf \
+                   --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \
+                apt-fast "$@" --allow-downgrades 
+
+
+elif [ "$1" = "download" ];then
+DEPEND=`which  apt-fast`
+if [ "$DEPEND" = "" ] ; then 
+echo "未安装依赖：apt-fast 开始安装"
+aptss ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y 
 fi
 
 ###执行
@@ -30,6 +49,15 @@ bwrap --dev-bind / / \
                 apt-fast "$@" --allow-downgrades 
 
 
+elif [ "$1" = "policy" ] || [ "$1" = "search" ];then
+sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"  -o Dir::etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
+
+###执行
+bwrap --dev-bind / / \
+                   --bind '/tmp/aptss-conf/apt-fast.conf' /etc/apt-fast.conf \
+                   --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \
+                apt "$@" --allow-downgrades 
+
 elif [ "$1" = "ssupdate" ];then
 
 mkdir -p /tmp/aptss-conf/
diff --git a/tool/ssinstall b/tool/ssinstall
index db7ee0a..749d336 100755
--- a/tool/ssinstall
+++ b/tool/ssinstall
@@ -65,7 +65,7 @@ fi
 if  [ "$DEPEND" != "" ]  && [ "$isuos" = "" ]; then
 echo "检测到apt-fast，使用aptss进行多线程下载加速"
 echo ----------------------------------------------------------------------------------
-echo "$upass" | sudo -S dpkg -i $1 || sudo aptss ssupdate && sudo aptss install -yf 
+echo "$upass" | sudo -S dpkg -i $1 || sudo aptss install -yf 
 fi
 
 
@@ -90,7 +90,7 @@ fi
 if  [ "$DEPEND" != "" ]  && [ "$isuos" = "" ]; then
 echo "检测到apt-fast，使用aptss进行多线程下载加速"
 echo ----------------------------------------------------------------------------------
-dpkg -i $1 || aptss ssupdate && aptss install -yf 
+dpkg -i $1 || aptss install -yf 
 fi
 
 

From 8902c81b9ec5bb13c493df5d754a79bcdc77559d Mon Sep 17 00:00:00 2001
From: Pluto <lizhiyuan@uniartisan.com>
Date: Tue, 27 Sep 2022 01:34:18 +0000
Subject: [PATCH 02/11] =?UTF-8?q?!118=20fix:=20high=20CPU=20usage=20becaus?=
 =?UTF-8?q?e=20futex=20is=20still=20waiting=20for=20queue=20after=20illega?=
 =?UTF-8?q?l=20exit=20*=20fix=20*=20Merge=20remote-tracking=20branch=20'up?=
 =?UTF-8?q?stream/dev'=20into=20dev=20*=20fix:=20high=20CPU=20usage=20beca?=
 =?UTF-8?q?use=20futex=20is=20still=20waiting=20for=20queue=20after=20ille?=
 =?UTF-8?q?gal=20exit=20*=20Merge=20remote-tracking=20branch=20'upstream/m?=
 =?UTF-8?q?aster'=20into=20dev=20*=20Merge=20remote-tracking=20branch=20'u?=
 =?UTF-8?q?pstream/dev'=20into=20dev=20*=20feat:=20enable=20GPU=20*=20!113?=
 =?UTF-8?q?=203.2.1=20merge=20*=20!112=20Now=20stop=20use=20mail=20to=20co?=
 =?UTF-8?q?llect=20info=20*=20Merge=20remote-tracking=20branch=20'upstream?=
 =?UTF-8?q?/dev'=20into=20dev=20*=20Merge=20branch=20'dev'=20of=20gitee.co?=
 =?UTF-8?q?m:uniartisan2018/spark-store=20into=20dev=20*=20feat:=20?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E7=BD=91=E9=A1=B5=E7=BC=93=E5=AD=98=20*=20?=
 =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9=20*=20update=20src/widget.?=
 =?UTF-8?q?ui.=20*=20feat:=20=E6=98=9F=E7=81=AB=E5=BA=94=E7=94=A8=E5=95=86?=
 =?UTF-8?q?=E5=BA=97=E6=A3=80=E6=B5=8B=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget.cpp | 41 +++++++++++++++++++++--------------------
 src/widget.h   |  1 +
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/widget.cpp b/src/widget.cpp
index f0bb212..8e7d2eb 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -18,6 +18,7 @@
 #include <QSettings>
 #include <QGraphicsOpacityEffect>
 #include <QtConcurrent> // 并发
+#include <QCloseEvent>  // close event
 
 #include <DApplication>
 #include <DGuiApplicationHelper>
@@ -572,14 +573,14 @@ void Widget::chooseLeftMenu(int index)
 
     updateUI();
 
-    if(index <= 12)
+    if (index <= 12)
     {
-        if(themeIsDark)
+        if (themeIsDark)
         {
             QString darkurl = menuUrl[index].toString();
             QStringList list = darkurl.split("/");
             darkurl.clear();
-            for(int i = 0; i < list.size() - 1; i++)
+            for (int i = 0; i < list.size() - 1; i++)
             {
                 darkurl += list[i] + "/";
             }
@@ -687,22 +688,18 @@ void Widget::searchApp(QString text)
     }
     else
     {
-        // sendNotification(tr("Spark store could only process spk:// links for now. The search feature is coming soon!"));
-        // ui->webView->setUrl(QUrl("http://www.baidu.com/s?wd="+text));    // 这东西对接百度
-        // ui->stackedWidget->setCurrentIndex(0);
-
         // 禁止同时进行多次搜索
-        if(!mutex.tryLock())
+        if (!mutex.tryLock())
         {
             return;
         }
 
         // 关键字搜索处理
         httpClient->get("https://search.deepinos.org.cn/appinfo/search")
-                .header("content-type", "application/json")
-                .queryParam("keyword", text)
-                .onResponse([this](QByteArray result)
-        {
+            .header("content-type", "application/json")
+            .queryParam("keyword", text)
+            .onResponse([this](QByteArray result)
+                        {
             auto json = QJsonDocument::fromJson(result).array();
             if (json.empty())
             {
@@ -711,20 +708,24 @@ void Widget::searchApp(QString text)
                 mutex.unlock();
                 return;
             }
-            displaySearchApp(json);
-        })
-        .onError([this](QString errorStr)
-        {
+            displaySearchApp(json); })
+            .onError([this](QString errorStr)
+                     {
             qDebug()  << "请求出错：" << errorStr;
             sendNotification(QString(tr("Request Error: %1")).arg(errorStr));
             mutex.unlock();
-            return;
-        })
-        .timeout(10 * 1000)
-                .exec();
+            return; })
+            .timeout(10 * 1000)
+            .exec();
     }
 }
 
+void Widget::closeEvent(QCloseEvent *event)
+{
+    mutex.unlock();
+    httpClient->deleteLater();
+}
+
 /**
  * @brief 展示搜索的APP信息
  */
diff --git a/src/widget.h b/src/widget.h
index f9faad9..9ec716e 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -128,6 +128,7 @@ private:
     void setfoot(int);
     void updatefoot();
     void updateUI();
+    void closeEvent(QCloseEvent *event);
 
     quint64 dirFileSize(const QString &path);
 

From ad57aa26ff8a2c7caa4fa0ea6592f05963b732db Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Tue, 27 Sep 2022 01:34:48 +0000
Subject: [PATCH 03/11] =?UTF-8?q?=E9=99=8D=E4=BD=8Edtk=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: shenmo <jifengshenmo@outlook.com>
---
 debian/control | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index b5f8340..3917216 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,9 @@ Build-Depends:
  libqt5widgets5,
  libqt5network5,
  libqt5concurrent5,
- libdtkcore-dev(>=5.2),
- libdtkgui-dev(>=5.2),
- libdtkwidget-dev(>=5.2),
+ libdtkcore-dev(>=5.0),
+ libdtkgui-dev(>=5.0),
+ libdtkwidget-dev(>=5.0),
  qttools5-private-dev,
  libnotify-dev,
  qtwebengine5-dev

From 21d33ec347d7cf5090c44dab5d2baa1578c1680b Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Tue, 27 Sep 2022 01:48:34 +0000
Subject: [PATCH 04/11] update debian/changelog.

Signed-off-by: shenmo <jifengshenmo@outlook.com>
---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8a72289..7381de5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+spark-store (3.2.3) stable; urgency=medium
+
+  * 客户端异常退出时仍然占用资源问题修复
+  * 降低dtk依赖版本，Debian 11 stable可直接安装
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 spark-store (3.2.2) stable; urgency=medium
 
   * aptss will now refresh the system source before doing install,  policy....etc

From 10125c58168d68e21cdd94ca911603dcc6595850 Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Tue, 27 Sep 2022 01:49:01 +0000
Subject: [PATCH 05/11] update src/main.cpp.

Signed-off-by: shenmo <jifengshenmo@outlook.com>
---
 src/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 5aacfdb..bb74f29 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -34,7 +34,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.2.2"));
+      dialog.setVersion(DApplication::buildVersion("Version 3.2.3"));
       dialog.setProductIcon(QIcon::fromTheme("spark-store"));  // 设置Logo
       dialog.setProductName(QLabel::tr("Spark Store"));
       dialog.setDescription(
@@ -55,7 +55,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.2.2"));
+    a.setApplicationVersion(DApplication::buildVersion("3.2.3"));
     a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
     a.setApplicationDescription(
                 QObject::tr(

From 81993625ba572f04c778f622376116d9a395b80f Mon Sep 17 00:00:00 2001
From: lisuke <1657787678@qq.com>
Date: Tue, 27 Sep 2022 12:14:48 +0000
Subject: [PATCH 06/11] =?UTF-8?q?!120=20=E6=B7=BB=E5=8A=A0=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E4=BE=9D=E8=B5=96=20fakeroot=20*=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=20fakeroot=20=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.zh.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.zh.md b/README.zh.md
index fb2f7bf..66f300c 100644
--- a/README.zh.md
+++ b/README.zh.md
@@ -26,7 +26,7 @@
 Deepin V20/UOS 21 系统下, 安装依赖
 
 ```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
+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 fakeroot
 
 ```
 

From 30860802dd9446fdc257a508ffeb57531e0d7baa Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Fri, 30 Sep 2022 11:27:22 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E6=B8=85=E9=99=A4=E5=85=8D=E5=AF=86=E7=A0=81=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/changelog         | 7 +++++++
 debian/spark-store.prerm | 6 ++++++
 src/main.cpp             | 4 ++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7381de5..069025f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+spark-store (3.2.4) stable; urgency=medium
+
+  * 客户端更新时不关闭免密码登录
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 spark-store (3.2.3) stable; urgency=medium
 
   * 客户端异常退出时仍然占用资源问题修复
diff --git a/debian/spark-store.prerm b/debian/spark-store.prerm
index 6c0d052..8c44924 100755
--- a/debian/spark-store.prerm
+++ b/debian/spark-store.prerm
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+if [ "$1" = "remove" ] || [ "$1" = "purge" ];then
 # Remove residual symbol links
 rm /usr/local/bin/spark-store
 rm /usr/local/bin/ssinstall
@@ -39,3 +40,8 @@ fi
 
 apt-key del '9D9A A859 F750 24B1 A1EC  E16E 0E41 D354 A29A 440C'
 
+else
+
+echo "非卸载操作，不进行配置清理"
+
+fi
diff --git a/src/main.cpp b/src/main.cpp
index bb74f29..e0f07f8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -34,7 +34,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.2.3"));
+      dialog.setVersion(DApplication::buildVersion("Version 3.2.4"));
       dialog.setProductIcon(QIcon::fromTheme("spark-store"));  // 设置Logo
       dialog.setProductName(QLabel::tr("Spark Store"));
       dialog.setDescription(
@@ -55,7 +55,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.2.3"));
+    a.setApplicationVersion(DApplication::buildVersion("3.2.4"));
     a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
     a.setApplicationDescription(
                 QObject::tr(

From 085eddd66f5194cf0eb95d7243ad40a666bf3391 Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Fri, 7 Oct 2022 22:31:24 +0800
Subject: [PATCH 08/11] =?UTF-8?q?UOS=20=E8=B5=B0=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E7=9A=84aptss=EF=BC=8Captss=E6=94=AF=E6=8C=81UOS=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/changelog                     |  1 +
 tool/apt-fast-conf/apt-fast.conf     | 22 ++++++++++++++--------
 tool/ssinstall                       | 18 ++----------------
 tool/update-upgrade/ss-do-upgrade.sh | 28 ----------------------------
 4 files changed, 17 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 069025f..332d487 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 spark-store (3.2.4) stable; urgency=medium
 
   * 客户端更新时不关闭免密码登录
+  * UOS合并正常aptss中
 
 
 -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
diff --git a/tool/apt-fast-conf/apt-fast.conf b/tool/apt-fast-conf/apt-fast.conf
index 0139d67..47f2576 100644
--- a/tool/apt-fast-conf/apt-fast.conf
+++ b/tool/apt-fast-conf/apt-fast.conf
@@ -14,6 +14,15 @@
 _APTMGR=apt
 
 
+####
+#
+# UOS sources auth config
+#
+#
+if grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release;then
+AUTH_UOS_USER="uos-https://license.chinauos.com-apt"
+AUTH_UOS_PASSWD="a=SHEDW8U8E8SDHP5A&aa=&ab=v1&ad=8c584d561897bb0cfaed06448d2c00db&ae=4d06bb476c4b49299bf61131adf74d9e&af=4&ag=UNKNOW:ec529f04c7dffb7bd5859f561259aebc&ah=000C292C00DB&b=v2&c=62b2b266c66f30000167448b&d=N7AADCAAYHAKM54KZJQKMPEBV&e=8aa2da8715ffe6f0b01c4a6bba1d8c91&f=7568a02ccfda9af6a3a4b73094daf161&g=AA2SAA&h=21.3.1&i=101&j=422f2415ea7d14119aae28d80aad4695&k=245f-5674-f133-2b01&l=93a6-0ba8-5d84-a21a&m=245f-5674-f133-2b01&n=,|&o=VMwareVirtualS|VMwareVirtualS&p=ec529f04c7dffb7bd5859f561259aebc&q=19e1fe0a654af0eccca498848d024e64&r=000C292C00DB&s=1&t=2&v=5.6.30&w=&x=6&y=-1&z=v3/vm"
+fi
 # Enable DOWNLOADBEFORE to suppress apt-fast confirmation dialog and download
 # packages directly.
 #
@@ -54,7 +63,7 @@ DOWNLOADBEFORE=true
 #
 # 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/,http://cdn.dl.uniartisan.com:9000/deepinos/' )
+MIRRORS=( 'https://d.store.deepinos.org.cn/,https://mirrors.sdu.edu.cn/spark-store-repository/,http://cdn.dl.uniartisan.com:9000/deepinos/,https://d1.store.deepinos.org.cn/,https://d2.store.deepinos.org.cn/,https://d4.store.deepinos.org.cn/,https://d5.store.deepinos.org.cn/' )
 
 
 # Maximum number of connections
@@ -68,14 +77,10 @@ _MAXNUM=5
 # Maximum number of connections per server
 # Default: 10
 #
-_MAXCONPERSRV=10
+_MAXCONPERSRV=1
+
 
 
-# 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
@@ -93,6 +98,7 @@ _MINSPLITSZ=1M
 _PIECEALGO=default
 
 
+
 # Downloadmanager listfile
 # You can use this value in _DOWNLOADER command. Escape with ${}: ${DLLIST}
 #
@@ -118,7 +124,7 @@ DLLIST='/tmp/apt-fast.list'
 #
 # 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'
+_DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV}  --min-split-size=${_MINSPLITSZ}  --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0 --http-user ${AUTH_UOS_USER} --http-passwd ${AUTH_UOS_PASSWD}'
 
 
 # Download temp folder for Downloadmanager
diff --git a/tool/ssinstall b/tool/ssinstall
index 749d336..d361c71 100755
--- a/tool/ssinstall
+++ b/tool/ssinstall
@@ -40,8 +40,6 @@ fi
 
 ##################apt-fast/metalink测试
 DEPEND="这里一定会安装所以放弃处理"
-isuos=`cat /etc/os-release | grep UnionTech`
-
 
 ##############判断是否是root运行，如果是，则正常走；如果不是，则代输密码
 if [ "$(id -u)" != "0" ];then
@@ -54,15 +52,8 @@ echo "$upass" | sudo -S aptss ssupdate && echo "$upass" | sudo -S bwrap --dev-bi
 
 fi
 
-if [ "$DEPEND" != "" ]  && [ "$isuos" != "" ]; then
-echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast"
-echo ----------------------------------------------------------------------------------
-echo "$upass" | sudo -S dpkg -i $1 || sudo aptss ssupdate && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install -yf
 
-
-fi
-
-if  [ "$DEPEND" != "" ]  && [ "$isuos" = "" ]; then
+if  [ "$DEPEND" != "" ]; then
 echo "检测到apt-fast，使用aptss进行多线程下载加速"
 echo ----------------------------------------------------------------------------------
 echo "$upass" | sudo -S dpkg -i $1 || sudo aptss install -yf 
@@ -81,13 +72,8 @@ echo "未安装依赖：apt-fast 开始安装"
 aptss ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y 
 fi
 
-if [ "$DEPEND" != "" ]  && [ "$isuos" != "" ]; then
-echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast"
-echo ----------------------------------------------------------------------------------
-dpkg -i $1 || aptss ssupdate && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install -yf
-fi
 
-if  [ "$DEPEND" != "" ]  && [ "$isuos" = "" ]; then
+if  [ "$DEPEND" != "" ]; then
 echo "检测到apt-fast，使用aptss进行多线程下载加速"
 echo ----------------------------------------------------------------------------------
 dpkg -i $1 || aptss install -yf 
diff --git a/tool/update-upgrade/ss-do-upgrade.sh b/tool/update-upgrade/ss-do-upgrade.sh
index be5a580..990a0c8 100755
--- a/tool/update-upgrade/ss-do-upgrade.sh
+++ b/tool/update-upgrade/ss-do-upgrade.sh
@@ -8,33 +8,6 @@ echo "获取更新列表..."
 PKG_LIST="$(bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" | awk 'BEGIN {FS="/"} {print $1}' | awk NR\>1)"
 
 
-isuos=`cat /etc/os-release | grep UnionTech`
-if [ "$isuos" != "" ]; then ###这是确定是否为UOS 如果是
-echo "UOS中系统依赖无法使用第三方下载工具，使用apt-fast下载本体"
-
-  cd /var/cache/apt/archives
-  for PKG_NAME in $PKG_LIST;
-  do
-    echo "$PKG_NAME 正在下载..."
-  sudo aptss download "$PKG_NAME" -y >/dev/null 2>&1;
-  done
-   
-  echo "----开始安装"
-  for PKG_NAME in $PKG_LIST;
-  do
-    echo "$PKG_NAME 正在更新..."
-    if sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install "$PKG_NAME" -y   >/dev/null 2>&1;
-    then
-      echo "$PKG_NAME 已更新"
-    else
-      echo "WARNING: $PKG_NAME 无法更新"
-    fi
-  done
-
-
-
-else ###这是确定是否为UOS,如果不是
-
   for PKG_NAME in $PKG_LIST;
   do
     echo "$PKG_NAME 正在更新..."
@@ -47,6 +20,5 @@ else ###这是确定是否为UOS,如果不是
   done
 
 
-fi ###这是确定是否为UOS
 
 fi  ###这是确定是否同意
\ No newline at end of file

From fec604b481666c7f01e82e42f04a30e4483be1eb Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Sat, 8 Oct 2022 03:22:12 +0000
Subject: [PATCH 09/11] update debian/changelog.

Signed-off-by: shenmo <jifengshenmo@outlook.com>
---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 332d487..aa5a836 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-spark-store (3.2.4) stable; urgency=medium
+spark-store (3.2.4~test1) stable; urgency=medium
 
   * 客户端更新时不关闭免密码登录
   * UOS合并正常aptss中

From a13f0ddcb786576616cdc00ec0aedb68db2f0463 Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Sat, 8 Oct 2022 13:47:00 +0000
Subject: [PATCH 10/11] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=AF=BB=E5=8F=96/etc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: shenmo <jifengshenmo@outlook.com>
---
 tool/apt-fast-conf/apt-fast.conf | 315 ++++++++++++++++++++++++++++++-
 1 file changed, 314 insertions(+), 1 deletion(-)

diff --git a/tool/apt-fast-conf/apt-fast.conf b/tool/apt-fast-conf/apt-fast.conf
index 47f2576..92d555f 100644
--- a/tool/apt-fast-conf/apt-fast.conf
+++ b/tool/apt-fast-conf/apt-fast.conf
@@ -21,7 +21,9 @@ _APTMGR=apt
 #
 if grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release;then
 AUTH_UOS_USER="uos-https://license.chinauos.com-apt"
-AUTH_UOS_PASSWD="a=SHEDW8U8E8SDHP5A&aa=&ab=v1&ad=8c584d561897bb0cfaed06448d2c00db&ae=4d06bb476c4b49299bf61131adf74d9e&af=4&ag=UNKNOW:ec529f04c7dffb7bd5859f561259aebc&ah=000C292C00DB&b=v2&c=62b2b266c66f30000167448b&d=N7AADCAAYHAKM54KZJQKMPEBV&e=8aa2da8715ffe6f0b01c4a6bba1d8c91&f=7568a02ccfda9af6a3a4b73094daf161&g=AA2SAA&h=21.3.1&i=101&j=422f2415ea7d14119aae28d80aad4695&k=245f-5674-f133-2b01&l=93a6-0ba8-5d84-a21a&m=245f-5674-f133-2b01&n=,|&o=VMwareVirtualS|VMwareVirtualS&p=ec529f04c7dffb7bd5859f561259aebc&q=19e1fe0a654af0eccca498848d024e64&r=000C292C00DB&s=1&t=2&v=5.6.30&w=&x=6&y=-1&z=v3/vm"
+AUTH_UOS_PASSWD="`cat /etc/apt/auth.conf.d/uos.conf  | grep home-packages.chinauos.com`"
+AUTH_UOS_PASSWD=`echo ${AUTH_UOS_PASSWD#*password }`
+
 fi
 # Enable DOWNLOADBEFORE to suppress apt-fast confirmation dialog and download
 # packages directly.
@@ -151,3 +153,314 @@ APTCACHE='/var/cache/apt/archives'
 #  cRed='\e[0;31m'
 #  cBlue='\e[0;34m'
 #  endColor='\e[0m'
+###################################################################
+# 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
+
+
+####
+#
+# UOS sources auth config
+#
+#
+if grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release;then
+AUTH_UOS_USER="uos-https://license.chinauos.com-apt"
+AUTH_UOS_PASSWD="`cat /etc/apt/auth.conf.d/uos.conf  | grep home-packages.chinauos.com`"
+AUTH_UOS_PASSWD=`echo ${AUTH_UOS_PASSWD#*password }`
+
+fi
+# 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://mirrors.sdu.edu.cn/spark-store-repository/,http://cdn.dl.uniartisan.com:9000/deepinos/,https://d1.store.deepinos.org.cn/,https://d2.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=1
+
+
+
+
+
+# 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}  --min-split-size=${_MINSPLITSZ}  --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0 --http-user ${AUTH_UOS_USER} --http-passwd ${AUTH_UOS_PASSWD}'
+
+
+# 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'
+###################################################################
+# 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
+
+
+####
+#
+# UOS sources auth config
+#
+#
+if grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release;then
+AUTH_UOS_USER="uos-https://license.chinauos.com-apt"
+AUTH_UOS_PASSWD="`cat /etc/apt/auth.conf.d/uos.conf  | grep home-packages.chinauos.com`"
+AUTH_UOS_PASSWD=`echo ${AUTH_UOS_PASSWD#*password }`
+
+fi
+# 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://mirrors.sdu.edu.cn/spark-store-repository/,http://cdn.dl.uniartisan.com:9000/deepinos/,https://d1.store.deepinos.org.cn/,https://d2.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=1
+
+
+
+
+
+# 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}  --min-split-size=${_MINSPLITSZ}  --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0 --http-user ${AUTH_UOS_USER} --http-passwd ${AUTH_UOS_PASSWD}'
+
+
+# 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'
+]]]]]]]]
\ No newline at end of file

From 59607f6b34a6cd89a6d002e26f0e6c902ba3703d Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Sat, 8 Oct 2022 14:08:30 +0000
Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: shenmo <jifengshenmo@outlook.com>
---
 tool/apt-fast-conf/apt-fast.conf | 311 -------------------------------
 1 file changed, 311 deletions(-)

diff --git a/tool/apt-fast-conf/apt-fast.conf b/tool/apt-fast-conf/apt-fast.conf
index 92d555f..eb93e80 100644
--- a/tool/apt-fast-conf/apt-fast.conf
+++ b/tool/apt-fast-conf/apt-fast.conf
@@ -153,314 +153,3 @@ APTCACHE='/var/cache/apt/archives'
 #  cRed='\e[0;31m'
 #  cBlue='\e[0;34m'
 #  endColor='\e[0m'
-###################################################################
-# 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
-
-
-####
-#
-# UOS sources auth config
-#
-#
-if grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release;then
-AUTH_UOS_USER="uos-https://license.chinauos.com-apt"
-AUTH_UOS_PASSWD="`cat /etc/apt/auth.conf.d/uos.conf  | grep home-packages.chinauos.com`"
-AUTH_UOS_PASSWD=`echo ${AUTH_UOS_PASSWD#*password }`
-
-fi
-# 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://mirrors.sdu.edu.cn/spark-store-repository/,http://cdn.dl.uniartisan.com:9000/deepinos/,https://d1.store.deepinos.org.cn/,https://d2.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=1
-
-
-
-
-
-# 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}  --min-split-size=${_MINSPLITSZ}  --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0 --http-user ${AUTH_UOS_USER} --http-passwd ${AUTH_UOS_PASSWD}'
-
-
-# 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'
-###################################################################
-# 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
-
-
-####
-#
-# UOS sources auth config
-#
-#
-if grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release;then
-AUTH_UOS_USER="uos-https://license.chinauos.com-apt"
-AUTH_UOS_PASSWD="`cat /etc/apt/auth.conf.d/uos.conf  | grep home-packages.chinauos.com`"
-AUTH_UOS_PASSWD=`echo ${AUTH_UOS_PASSWD#*password }`
-
-fi
-# 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://mirrors.sdu.edu.cn/spark-store-repository/,http://cdn.dl.uniartisan.com:9000/deepinos/,https://d1.store.deepinos.org.cn/,https://d2.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=1
-
-
-
-
-
-# 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}  --min-split-size=${_MINSPLITSZ}  --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0 --http-user ${AUTH_UOS_USER} --http-passwd ${AUTH_UOS_PASSWD}'
-
-
-# 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'
-]]]]]]]]
\ No newline at end of file