fix: 修复应用更新失败问题

zenity 处理多选框时，返回结果取值错误导致，获取值实际为已安装版本号，而不是包名

Log: 修改 zenity 参数为 --print-column=2 获取包名

.workflow/dtk-build-commit-20220425.yml

@@ -18,7 +18,7 @@ stages:
         name: execute_by_docker
         displayName: 基于镜像的脚本执行
         certificate: ''
-        image: docker.io/debian:buster-slim
+        image: docker.io/debian:buster
         command:
           - sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
           - '# 换源'

.workflow/dtk-build-release-tag-20220425.yml

@@ -14,31 +14,40 @@ stages:
     trigger: auto
     executor: []
     steps:
-      - step: build@nodejs
-        name: build_dtk
-        displayName: DTK构建
-        nodeVersion: 14.16.0
-        commands:
-          - git clone https://gitlink.org.cn/shenmo7192/debian-10-container.git
-          - mv debian-10-container/Debian-10.tar.xz /mnt
-          - rm -rf debian-10-container
-          - WORK_DIR=`pwd`
-          - yum install xz -y
-          - cd /mnt/
-          - tar -xf Debian-10.tar.xz
-          - cd Debian-10
-          - wget https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/spark-build.sh
-          - chmod +x spark-build.sh
-          - mkdir  build-spark
-          - cp -r $WORK_DIR build-spark/spark-store
-          - echo "进入Debian 10环境"
-          - chroot /mnt/Debian-10 /bin/bash /spark-build.sh
-          - cd /mnt/Debian-10/build-spark
+      - step: execute@docker
+        name: execute_by_docker
+        displayName: 基于镜像的DTK构建
+        certificate: ''
+        image: docker.io/debian:buster
+        command:
+          - sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
+          - '# 换源'
+          - apt update
+          - export DEBIAN_FRONTEND=noninteractive
+          - echo "安装git devscripts equivs curl..."
+          - 'apt install git devscripts equivs curl -y '
+          - git clone https://gitlink.org.cn/shenmo7192/dtk-old-bundle.git
+          - cd dtk-old-bundle
+          - apt install ./*.deb -y
+          - cd ..
+          - rm -rf dtk-old-bundle
+          - ''
+          - 'mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes  -y" '
+          - ''
+          - dpkg-buildpackage -b -us -uc
+          - cd ..
+          - ls -all
+          - pwd
+          - ''
+          - 'mkdir target '
+          - for f in $(find . -type f -name "*.deb")
+          - do
+          - '    mv $f target'
+          - done
         artifacts:
           - name: BUILD_ARTIFACT
             path:
-              - /mnt/Debian-10/build-spark/target
-        caches: []
+              - ../target
         notify: []
         strategy:
           retry: '0'

debian/changelog

@@ -1,3 +1,46 @@
+spark-store (3.5.3) stable; urgency=medium
+
+  * fix: sender-d功能修复
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.5.2) stable; urgency=medium
+
+  * fix: aptss 转为使用内置的ss-apt-fast指令
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.5.1.1) stable; urgency=medium
+
+  * fix: aptss shebang 修复
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.5.1) stable; urgency=medium
+
+  * fix: 搜索修复，在appinfo界面可以正常搜索
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.5) stable; urgency=medium
+
+  * feat: 搜索转为使用网页，提高加载速度和用户体验
+  * 下载软件时指定DNS,修复移动网络问题
+  * 准备进入LTS阶段
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.4~test1) stable; urgency=medium
+
+  * feat: aptss不再尝试安装apt-fast，转而自带
+  * chore:  删除password-check模块
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 spark-store (3.3.3) stable; urgency=medium
 
   * feat: 首页链接调用浏览器打开 

debian/spark-store.postinst

@@ -30,6 +30,9 @@ case "$1" in
 		
      	       ln -s -f /opt/durapps/spark-store/bin/aptss /usr/bin/aptss
 
+		# Create symbol links for SSINSTALL 
+		ln -s -f  /opt/durapps/spark-store/bin/auto-install-policy/store.spark-app.ssinstall.policy /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
+
 		# Compile the Sender module
 
 		gcc /opt/durapps/spark-store/bin/ss-feedback/sender-d.sh.c -o /opt/durapps/spark-store/bin/ss-feedback/sender-d

debian/spark-store.prerm

@@ -8,8 +8,10 @@ rm /usr/local/bin/spark-dstore-patch
 rm /usr/local/bin/ussinstall
 rm /usr/local/bin/ussremove
 rm /usr/local/bin/ss-apt-fast
+
 rm /usr/bin/aptss
 
+
 rm -rf /etc/aptss/
 
 # Remove Sender module

src/downloadlist.cpp

@@ -169,7 +169,7 @@ void downloadlist::install(int t)
 
             QProcess isInstall;
             isInstall.start("dpkg -s " + pkgName);
-            isInstall.waitForFinished(180); // 默认超时 3 分钟
+            isInstall.waitForFinished(180*1000); // 默认超时 3 分钟
             int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
             if(error == 0)
             {

src/downloadworker.cpp

@@ -109,6 +109,8 @@ void DownloadController::startDownload(const QString &url)
         QStringList command;
         QString downloadDir = "/tmp/spark-store/";
         QString aria2ConnectionPerServer = "--max-connection-per-server=1";
+        QString aria2ConnectionMax = "--max-concurrent-downloads=16";
+        QString aria2DNSCommand = "--async-dns-server=119.29.29.29,223.5.5.5";
 
         if (useMetalink){
             command.append(metaUrl.toUtf8());
@@ -130,6 +132,8 @@ void DownloadController::startDownload(const QString &url)
         command.append(aria2NoConfig.toUtf8());
         command.append(aria2SizePerThreads.toUtf8());
         command.append(aria2ConnectionPerServer.toUtf8());
+        command.append(aria2ConnectionMax.toUtf8());
+        command.append(aria2DNSCommand.toUtf8());
         if (useMetalink){
             command.append(aria2NoSeeds.toUtf8());
         }
@@ -205,7 +209,12 @@ void DownloadController::startDownload(const QString &url)
         * https://en.wikipedia.org/wiki/HD_70642
         * HD 70642 is a star with an exoplanetary companion in the southern constellation of Puppis. 
         */
-        system(SenderdPath.toUtf8() + " " + metaUrl.toUtf8() + " " + "HD70642");
+        QProcess mailProcess;
+        mailProcess.start(SenderdPath.toUtf8() + " " + metaUrl.toUtf8() + " " + "HD70642");
+        mailProcess.waitForStarted();
+        mailProcess.waitForFinished();
+        mailProcess.deleteLater();
+
 
         emit downloadFinished(); });
 }

src/main.cpp

@@ -20,7 +20,7 @@ DWIDGET_USE_NAMESPACE
 int main(int argc, char *argv[])
 {
     // Get build time
-    static const QString version = "Version 3.3.3";
+    static const QString version = "Version 3.5.3";
     static const QDate buildDate = QLocale( QLocale::English ).toDate( QString(__DATE__).replace("  ", " 0"), "MMM dd yyyy");
     static const QTime buildTime = QTime::fromString(__TIME__, "hh:mm:ss");
 
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
     if (readConfig.value("build/version").toString() != version){
         qDebug() << "Spark Store has been updated!";
         QSettings *setConfig = new QSettings(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat);
-        setConfig->setValue("build/version", "Version 3.3.3");
+        setConfig->setValue("build/version", version);
         setConfig->setValue("build/time", buildDate.toString("yyyy.MM.dd")+"-"+buildTime.toString());
         setConfig->deleteLater();
     }

src/widget.cpp

@@ -232,12 +232,12 @@ void Widget::initUI()
         });
 
     // 载入自定义字体
-    int loadedFontID = QFontDatabase::addApplicationFont(":/fonts/fonts/hksnzt.ttf");
-    QStringList loadedFontFamilies = QFontDatabase::applicationFontFamilies(loadedFontID);
-    if(!loadedFontFamilies.isEmpty())
-    {
-        font = loadedFontFamilies.at(0);
-    }
+    // int loadedFontID = QFontDatabase::addApplicationFont(":/fonts/fonts/hksnzt.ttf");
+    // QStringList loadedFontFamilies = QFontDatabase::applicationFontFamilies(loadedFontID);
+    // if(!loadedFontFamilies.isEmpty())
+    // {
+    //     font = loadedFontFamilies.at(0);
+    // }
     /* 全局字体设置
      * DApplication::setFont(font);
      */
@@ -751,38 +751,51 @@ void Widget::searchApp(QString text)
         }
 
         //加载动画
-        spinner->show();
-        spinner->start();
+//        spinner->show();
+//        spinner->start();
+
+//        // 关键字搜索处理
+//        httpClient->get("https://search.deepinos.org.cn/appinfo/search")
+//            .header("content-type", "application/json")
+//            .queryParam("keyword", text)
+//            .onResponse([this](QByteArray result)
+//                        {
+//            auto json = QJsonDocument::fromJson(result).array();
+//            if (json.empty())
+//            {
+//                qDebug() << "相关应用未找到！";
+//                sendNotification(tr("Relative apps Not Found!"));
+//                mutex.unlock();
+//                clearSearchApp();
+//                spinner->stop();
+//                spinner->hide();
+//                ui->stackedWidget->setCurrentIndex(0);
+//                ui->webEngineView->setUrl(QUrl("https://wayou.github.io/t-rex-runner"));
+//                return;
+//            }
+//            clearSearchApp();
+//            displaySearchApp(json); })
+//            .onError([this](QString errorStr)
+//                     {
+//            qDebug()  << "请求出错：" << errorStr;
+//            sendNotification(QString(tr("Request Error: %1")).arg(errorStr));
+//            mutex.unlock();
+//            return; })
+//            .timeout(10 * 1000)
+//            .exec();
+
+        if (!themeIsDark){
+            ui->webEngineView->setUrl(serverUrl + "store/#/search?keywords=" + text);
+        }else{
+            ui->webEngineView->setUrl(serverUrl + "store/#/darksearch?keywords=" + text);
+        }
+        ui->stackedWidget->setCurrentIndex(0);
+//        spinner->stop();
+//        spinner->hide();
+        ui->stackedWidget->setCurrentIndex(0);
+        mutex.unlock();
+
 
-        // 关键字搜索处理
-        httpClient->get("https://search.deepinos.org.cn/appinfo/search")
-            .header("content-type", "application/json")
-            .queryParam("keyword", text)
-            .onResponse([this](QByteArray result)
-                        {
-            auto json = QJsonDocument::fromJson(result).array();
-            if (json.empty())
-            {
-                qDebug() << "相关应用未找到！";
-                sendNotification(tr("Relative apps Not Found!"));
-                mutex.unlock();
-                clearSearchApp();
-                spinner->stop();
-                spinner->hide();
-                ui->stackedWidget->setCurrentIndex(0);
-                ui->webEngineView->setUrl(QUrl("https://wayou.github.io/t-rex-runner"));
-                return;
-            }
-            clearSearchApp();
-            displaySearchApp(json); })
-            .onError([this](QString errorStr)
-                     {
-            qDebug()  << "请求出错：" << errorStr;
-            sendNotification(QString(tr("Request Error: %1")).arg(errorStr));
-            mutex.unlock();
-            return; })
-            .timeout(10 * 1000)
-            .exec();
     }
 }
 
@@ -1187,7 +1200,7 @@ void Widget::on_pushButton_uninstall_clicked()
 
         QProcess check;
         check.start("dpkg", QStringList() << "-s" << pkgName.toLower());
-        check.waitForFinished(180); // 默认超时 3 分钟
+        check.waitForFinished(180*1000); // 默认超时 3 分钟
 
         if (check.readAllStandardOutput().isEmpty())
         {
@@ -1227,10 +1240,15 @@ void Widget::on_pushButton_clearWebCache_clicked()
 {
     QtConcurrent::run([=]()
                       {
-
         QString dataLocal = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
-        QDir cacheDir(dataLocal );
-        cacheDir.removeRecursively(); });
+        qDebug() << dataLocal;
+        QDir dataDir(dataLocal);
+        dataDir.removeRecursively();
+        dataLocal = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
+        qDebug() << dataLocal;
+        QDir cacheDir(dataLocal);
+        cacheDir.removeRecursively();
+        });
 }
 
 quint64 Widget::dirFileSize(const QString &path)

src/workerthreads.cpp

@@ -92,7 +92,7 @@ void SpkAppInfoLoaderThread::run()
         QProcess isInstall;
         packagename = json["Pkgname"].toString();
         isInstall.start("dpkg -s " + json["Pkgname"].toString());
-        isInstall.waitForFinished(180); // 默认超时 3 分钟
+        isInstall.waitForFinished(180*1000); // 默认超时 3 分钟
         int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
         if(error == 0)
         {
@@ -100,12 +100,12 @@ void SpkAppInfoLoaderThread::run()
 
             QProcess isUpdate;
             isUpdate.start("dpkg-query --showformat='${Version}' --show " + json["Pkgname"].toString());
-            isUpdate.waitForFinished(180); // 默认超时 3 分钟
+            isUpdate.waitForFinished(180*1000); // 默认超时 3 分钟
             QString localVersion = isUpdate.readAllStandardOutput();
             localVersion.replace("'", "");
 
             isUpdate.start("dpkg --compare-versions " + localVersion + " ge " + json["Version"].toString());
-            isUpdate.waitForFinished(180); // 默认超时 3 分钟
+            isUpdate.waitForFinished(180*1000); // 默认超时 3 分钟
             if(!isUpdate.exitCode())
             {
                 isUpdated = true;

tool/apt-fast/ss-apt-fast

@@ -0,0 +1,646 @@
+#!/bin/bash
+#
+# apt-fast v1.9
+# Use this just like aptitude or apt-get for faster package downloading.
+#
+# Copyright: 2008-2012 Matt Parnell, http://www.mattparnell.com
+# Improvements, maintenance, revisions - 2012, 2017-2018 Dominique Lasserre
+#
+# You may distribute this file under the terms of the GNU General
+# Public License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+[ -n "$DEBUG" ] && set -xv
+
+# Print colored messages.
+# Usage: msg "message text" "message type" "optional: err"
+# Message types are 'normal', 'hint' or 'warning'. Warnings and messages with a
+# third argument are piped to stderr.
+msg(){
+  msg_options=()
+  case "$2" in
+    normal) beginColor="$cGreen";;
+    hint) beginColor="$cBlue";;
+    warning) beginColor="$cRed";;
+    question) beginColor="$cRed"; msg_options=(-n);;
+    *) beginColor= ;;
+  esac
+
+  if [ -z "$3" ] && [ "$2" != "warning" ]; then
+    echo -e "${msg_options[@]}" "${aptfast_prefix}${beginColor}$1${endColor}"
+  else
+    echo -e "${msg_options[@]}" "${aptfast_prefix}${beginColor}$1${endColor}" >&2
+  fi
+}
+
+# Search for known options and decide if root privileges are needed.
+root=1  # default value: we need root privileges
+option=
+for argument in "$@"; do
+  case "$argument" in
+    upgrade | full-upgrade | install | dist-upgrade | build-dep)
+      option="install"
+      ;;
+    clean | autoclean)
+      option="clean"
+      ;;
+    download)
+      option="download"
+      root=0
+      ;;
+    source)
+      option="source"
+      root=0
+      ;;
+    changelog)
+      root=0
+      ;;
+  esac
+done
+
+# To handle priority of options correctly (environment over config file vars)
+# we need to preserve all interesting env variables. As this wouldn't be
+# difficult enough we have to preserve complete env vars (especially if value
+# ist set (even empty) or not) when changing context (sudo)...
+# Set a 'random' string to all unset variables.
+TMP_RANDOM="13979853562951413"
+TMP_LCK_FILE="${LCK_FILE-${TMP_RANDOM}}"
+TMP_DOWNLOADBEFORE="${DOWNLOADBEFORE-${TMP_RANDOM}}"
+TMP__APTMGR="${_APTMGR-${TMP_RANDOM}}"
+TMP_APTCACHE="${APTCACHE-${TMP_RANDOM}}"
+TMP_DLDIR="${DLDIR-${TMP_RANDOM}}"
+TMP_DLLIST="${DLLIST-${TMP_RANDOM}}"
+TMP_LISTDIR="${LISTDIR-${TMP_RANDOM}}"
+TMP__MAXNUM="${MAXNUM-${TMP_RANDOM}}"
+TMP__MAXCONPERSRV="${MAXCONPERSRV-${TMP_RANDOM}}"
+TMP__SPLITCON="${SPLITCON-${TMP_RANDOM}}"
+TMP__MINSPLITSZ=${MINSPLITSZ-${TMP_RANDOM}}
+TMP__PIECEALGO=${PIECEALGO-${TMP_RANDOM}}
+TMP_aptfast_prefix="${aptfast_prefix-${TMP_RANDOM}}"
+TMP_APT_FAST_TIMEOUT="${APT_FAST_TIMEOUT-${TMP_RANDOM}}"
+TMP_VERBOSE_OUTPUT="${VERBOSE_OUTPUT-${TMP_RANDOM}}"
+TMP_ftp_proxy="${ftp_proxy-${TMP_RANDOM}}"
+TMP_http_proxy="${http_proxy-${TMP_RANDOM}}"
+TMP_https_proxy="${https_proxy-${TMP_RANDOM}}"
+
+# Check for proper privileges.
+# Call explicitly with environment variables to get them into root conext.
+if [ "$root" = 1 ] && [ "$UID" != 0 ]; then
+  exec sudo DEBUG="$DEBUG" \
+            LCK_FILE="$TMP_LCK_FILE" \
+            DOWNLOADBEFORE="$TMP_DOWNLOADBEFORE" \
+            _APTMGR="$TMP__APTMGR" \
+            APTCACHE="$TMP_APTCACHE" \
+            DLDIR="$TMP_DLDIR" \
+            DLLIST="$TMP_DLLIST" \
+            LISTDIR="$TMP_LISTDIR" \
+            _MAXNUM="$TMP__MAXNUM" \
+            _MAXCONPERSRV="$TMP__MAXCONPERSRV" \
+            _SPLITCON="$TMP__SPLITCON" \
+            _MINSPLITSZ="$TMP__MINSPLITSZ" \
+            _PIECEALGO="$TMP__PIECEALGO" \
+            aptfast_prefix="$TMP_aptfast_prefix" \
+            APT_FAST_TIMEOUT="$TMP_APT_FAST_TIMEOUT" \
+            VERBOSE_OUTPUT="$TMP_VERBOSE_OUTPUT" \
+            ftp_proxy="$TMP_ftp_proxy" \
+            http_proxy="$TMP_http_proxy" \
+            https_proxy="$TMP_https_proxy" \
+            "$0" "$@"
+fi
+
+
+# Define lockfile.
+# Use /tmp as directory because everybody (not only root) has to have write
+# permissions.
+# We need lock for non-root commands too, because we only have one download
+# list file.
+LCK_FILE="/tmp/apt-fast"
+LCK_FD=99
+
+# Set default package manager, APT cache, temporary download dir,
+# temporary download list file, and maximal parallel downloads
+_APTMGR=apt-get
+eval "$(apt-config shell APTCACHE Dir::Cache::archives/d)"
+# Check if APT config option Dir::Cache::archives::apt-fast-partial is set.
+eval "$(apt-config shell apt_fast_partial Dir::Cache::archives::apt-fast-partial/d)"
+if [ -z "$apt_fast_partial" ]; then
+  eval "$(apt-config -o Dir::Cache::archives::apt-fast-partial=apt-fast shell DLDIR Dir::Cache::archives::apt-fast-partial/d)"
+else
+  eval "$(apt-config shell DLDIR Dir::Cache::archives::apt-fast-partial/d)"
+fi
+# Currently not needed.
+eval "$(apt-config shell LISTDIR Dir::State::lists/d)"
+DLLIST="/tmp/apt-fast.list"
+_MAXNUM=5
+_MAXCONPERSRV=10
+_SPLITCON=8
+_MINSPLITSZ="1M"
+_PIECEALGO="default"
+
+# Prefix in front of apt-fast output:
+aptfast_prefix=
+# aptfast_prefix="$(date '+%b %_d %T.%N') apt-fast: "
+
+# Set color variables.
+cGreen='\e[0;32m'
+cRed='\e[0;31m'
+cBlue='\e[0;34m'
+endColor='\e[0m'
+
+# Set timout value for apt-fast download confirmation dialog.
+# Value is in seconds.
+APT_FAST_TIMEOUT=60
+
+# Ask for download confirmation if unset
+DOWNLOADBEFORE=
+
+# Formatted package list in download confirmation if unset
+VERBOSE_OUTPUT=
+
+# Download command.
+_DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} -i ${DLLIST} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} --connect-timeout=600 --timeout=600 -m0'
+
+# Load config file.
+CONFFILE="/etc/apt-fast.conf"
+if [ -e "$CONFFILE" ]; then
+    source "$CONFFILE"
+fi
+
+# no proxy as default
+ftp_proxy=
+http_proxy=
+https_proxy=
+
+# Now overwrite with preserved values if values were set before (compare with
+# 'random' string).
+[ "$TMP_LCK_FILE" = "$TMP_RANDOM" ] || LCK_FILE="$TMP_LCK_FILE"
+[ "$TMP_DOWNLOADBEFORE" = "$TMP_RANDOM" ] || DOWNLOADBEFORE="$TMP_DOWNLOADBEFORE"
+[ "$TMP__APTMGR" = "$TMP_RANDOM" ] || _APTMGR="$TMP__APTMGR"
+[ "$TMP_APTCACHE" = "$TMP_RANDOM" ] || APTCACHE="$TMP_APTCACHE"
+[ "$TMP_DLDIR" = "$TMP_RANDOM" ] || DLDIR="$TMP_DLDIR"
+[ "$TMP_DLLIST" = "$TMP_RANDOM" ] || DLLIST="$TMP_DLLIST"
+[ "$TMP_LISTDIR" = "$TMP_RANDOM" ] || LISTDIR="$TMP_LISTDIR"
+[ "$TMP__MAXNUM" = "$TMP_RANDOM" ] || _MAXNUM="$TMP__MAXNUM"
+[ "$TMP__MAXCONPERSRV" = "$TMP_RANDOM" ] || _MAXCONPERSRV="$TMP__MAXCONPERSRV"
+[ "$TMP__SPLITCON" = "$TMP_RANDOM" ] || _SPLITCON="$TMP__SPLITCON"
+[ "$TMP__MINSPLITSZ" = "$TMP_RANDOM" ] || _MINSPLITSZ="$TMP__MINSPLITSZ"
+[ "$TMP__PIECEALGO" = "$TMP_RANDOM" ] || _PIECEALGO="$TMP__PIECEALGO"
+[ "$TMP_aptfast_prefix" = "$TMP_RANDOM" ] || aptfast_prefix="$TMP_aptfast_prefix"
+[ "$TMP_APT_FAST_TIMEOUT" = "$TMP_RANDOM" ] || APT_FAST_TIMEOUT="$TMP_APT_FAST_TIMEOUT"
+[ "$TMP_VERBOSE_OUTPUT" = "$TMP_RANDOM" ] || VERBOSE_OUTPUT="$TMP_VERBOSE_OUTPUT"
+[ "$TMP_ftp_proxy" = "$TMP_RANDOM" ] || ftp_proxy="$TMP_ftp_proxy"
+[ "$TMP_http_proxy" = "$TMP_RANDOM" ] || http_proxy="$TMP_http_proxy"
+[ "$TMP_https_proxy" = "$TMP_RANDOM" ] || https_proxy="$TMP_https_proxy"
+
+
+# Disable colors if not executed in terminal.
+if [ ! -t 1 ]; then
+  cGreen=
+  cRed=
+  cBlue=
+  endColor=
+  #FIXME: Time not updated.
+  [ -z "$aptfast_prefix" ] && aptfast_prefix="[apt-fast $(date +"%T")]"
+fi
+
+
+msg_already_running()
+{
+  msg "apt-fast already running!" "warning"
+  msg "Verify that all apt-fast processes are finished then remove $LCK_FILE.lock and try again." "hint"
+}
+
+# Check if a lock file exists.
+if [ -f "$LCK_FILE.lock" ]; then
+  msg_already_running
+  exit 1
+fi
+
+
+# create the lock file and lock it, die on failure
+_create_lock()
+{
+    eval "exec $LCK_FD>\"$LCK_FILE.lock\""
+
+    trap "cleanup_aptfast; exit_cleanup_state" EXIT
+    trap "cleanup_aptfast; exit 1" INT TERM
+
+    flock -n $LCK_FD || { msg_already_running; exit 1; }
+}
+
+# unlock and remove the lock file
+_remove_lock()
+{
+    flock -u "$LCK_FD" 2>/dev/null
+    rm -f "$LCK_FILE.lock"
+}
+
+# Move download file away so missing permissions won't stop usage.
+CLEANUP_STATE=0
+cleanup_dllist()
+{
+  if [ -f "$DLLIST" ]
+  then
+    if ! mv -- "$DLLIST{,.old}" 2>/dev/null
+    then
+      if ! rm -f -- "$DLLIST" 2>/dev/null
+      then
+        msg "Could not clean up download list file." "warning"
+        CLEANUP_STATE=1
+      fi
+    fi
+  fi
+}
+
+cleanup_aptfast()
+{
+  [ "$CLEANUP_STATE" -eq 0 ] && CLEANUP_STATE=$?
+  cleanup_dllist
+  _remove_lock
+}
+
+exit_cleanup_state()
+{
+  exit $CLEANUP_STATE
+}
+
+# decode url string
+# translates %xx but must not convert '+' in spaces
+urldecode()
+{
+    printf '%b' "${1//%/\\x}"
+}
+
+# Check if mirrors are available. And if so add all mirrors to download list.
+get_mirrors(){
+  # Check all mirror lists.
+  for mirrorstr in "${MIRRORS[@]}"; do
+    # Build mirrors array from comma separated string.
+    IFS=", " read -r -a mirrors <<< "$mirrorstr"
+    # Check for all mirrors if URI of $1 is from mirror. If so add all other
+    # mirrors to (resmirror) list and break all loops.
+    for mirror in "${mirrors[@]}"; do
+      # Real expension.
+      if [[ "$1" == "$mirror"* ]]; then
+        filepath=${1#${mirror}}
+        # Build list for aria download list.
+        list="${mirrors[*]}"
+        echo -e "${list// /${filepath}\\t}$filepath\n"
+        return 0
+      fi
+    done
+  done
+  # No other mirrors found.
+  echo "$1"
+}
+
+# Globals to save package name, version, size and overall size.
+DOWNLOAD_DISPLAY=
+DOWNLOAD_SIZE=0
+# Get the package URLs.
+get_uris(){
+  if [ ! -d "$(dirname "$DLLIST")" ]
+  then
+    if ! mkdir -p -- "$(dirname "$DLLIST")"
+    then
+      msg "Could not create download file directory." "warning"
+      exit 1
+    fi
+  elif [ -f "$DLLIST" ]; then
+    if ! rm -f -- "$DLLIST" 2>/dev/null && ! touch -- "$DLLIST" 2>/dev/null
+    then
+      msg "Unable to write to download file. Try restarting with root permissions or run 'apt-fast clean' first." "warning"
+      exit 1
+    fi
+  fi
+
+  # Add header to overwrite file.
+  echo "# apt-fast mirror list: $(date)" > "$DLLIST"
+  #NOTE: aptitude doesn't have this functionality, so we use apt-get to get
+  #      package URIs.
+  case "$_APTMGR" in
+    apt|apt-get) uri_mgr=$_APTMGR;;
+    *) uri_mgr=apt-get;;
+  esac
+  uris_full="$("$uri_mgr" "${APT_SCRIPT_WARNING[@]}" -y --print-uris "$@")"
+  uris_full_ret="$?"
+  if [ "$uris_full_ret" -ne 0 ]
+  then
+    msg "Package manager quit with exit code." "warning"
+    exit "$uris_full_ret"
+  fi
+  while read -r pkg_uri_info
+  do
+    [ -z "$pkg_uri_info" ] && continue
+    ## --print-uris format is:
+    # 'fileurl' filename filesize checksum_hint:filechecksum
+    uri="$(echo "$pkg_uri_info" | cut -d' ' -f1 | tr -d "'")"
+    filename="$(echo "$pkg_uri_info" | cut -d' ' -f2)"
+    filesize="$(echo "$pkg_uri_info" | cut -d' ' -f3)"
+    checksum_string="$(echo "$pkg_uri_info" | cut -d' ' -f4)"
+    hash_algo="$(echo "$checksum_string" | cut -d':' -f1)"
+    checksum="$(echo "$checksum_string" | cut -d':' -f2)"
+
+    filename_decoded="$(urldecode "$filename")"
+    DOWNLOAD_DISPLAY="${DOWNLOAD_DISPLAY}$(echo "$filename_decoded" | cut -d'_' -f1)"
+    DOWNLOAD_DISPLAY="${DOWNLOAD_DISPLAY} $(echo "$filename_decoded" | cut -d'_' -f2)"
+    DOWNLOAD_DISPLAY="${DOWNLOAD_DISPLAY} $(echo "$filesize" | numfmt --to=iec-i --suffix=B)\n"
+    DOWNLOAD_SIZE=$((DOWNLOAD_SIZE + filesize))
+
+    ## whole uri comes encoded (urlencoded). Filename must NOT be decoded because
+    # plain aptitude do not decode it when download and install it. Therefore, we
+    # will have ugly named packages at /var/cache/apt/archives but is the standard
+    # behavior.
+    # But package version must be decoded, otherways package=version calls will
+    # not work.
+
+    if [ -n "$HASH_SUPPORTED" ]; then
+      case "$hash_algo" in
+        SHA512) [ -z "$SHA512_SUPPORTED" ] && hash_algo= || hash_algo=sha-512 ;;
+        SHA256) [ -z "$SHA256_SUPPORTED" ] && hash_algo= || hash_algo=sha-256 ;;
+        SHA1)   [ -z "$SHA1_SUPPORTED" ]   && hash_algo= || hash_algo=sha-1 ;;
+        MD5Sum) [ -z "$MD5sum_SUPPORTED" ] && hash_algo= || hash_algo=md5 ;;
+        *) hash_algo=
+      esac
+
+      # Using apt-cache show package=version to ensure recover single and
+      # correct package version.
+      # Warning: assuming that package naming uses '_' as field separator.
+      # Therefore, this code expects package-name_version_arch.deb Otherways
+      # below code will fail resoundingly
+      if [ -z "$hash_algo" ]; then
+        pkg_name="$(echo "$filename" | cut -d'_' -f1)"
+        pkg_version="$(echo "$filename" | cut -d'_' -f2)"
+        pkg_version="$(urldecode "$pkg_version")"
+        package_info="$(apt-cache show "$pkg_name=$pkg_version")"
+
+        patch_checksum=
+        if [ -n "$SHA512_SUPPORTED" ]; then
+          patch_checksum="$(echo "$package_info" | grep SHA512 | head -n 1)"
+          [ -n "$patch_checksum" ] && hash_algo="sha-512"
+        fi
+        if [ -z "$patch_checksum" ] && [ -n "$SHA256_SUPPORTED" ]; then
+          patch_checksum="$(echo "$package_info" | grep SHA256 | head -n 1)"
+          [ -n "$patch_checksum" ] && hash_algo="sha-256"
+        fi
+        if [ -z "$patch_checksum" ] && [ -n "$SHA1_SUPPORTED" ]; then
+          patch_checksum="$(echo "$package_info" | grep SHA1 | head -n 1)"
+          [ -n "$patch_checksum" ] && hash_algo="sha-1"
+        fi
+        if [ -z "$patch_checksum" ] && [ -n "$MD5sum_SUPPORTED" ]; then
+          patch_checksum="$(echo "$package_info" | grep MD5sum | head -n 1)"
+          [ -n "$patch_checksum" ] && hash_algo="md5"
+        fi
+
+        if [ -n "$patch_checksum" ]; then
+          checksum="$(echo "$patch_checksum" | cut -d' ' -f2)"
+        else
+          msg "Couldn't get supported checksum for $pkg_name ($pkg_version)." "warning"
+          REMOVE_WORKING_MESSAGE=
+        fi
+      fi
+    else
+      hash_algo=
+    fi
+
+    {
+      get_mirrors "$uri"
+      #echo " dir=$DLDIR"
+      if [ -n "$hash_algo" ]; then
+        echo " checksum=$hash_algo=$checksum"
+      fi
+      echo " out=$filename"
+    } >> "$DLLIST"
+  done <<<"$(echo "$uris_full" | grep -E "^'(http(s|)|(s|)ftp)://")"
+
+  #cat "$DLLIST"
+  #LCK_RM
+  #exit
+}
+
+display_downloadfile(){
+  if [ -n "$VERBOSE_OUTPUT" ]; then
+    cat "$DLLIST"
+  else
+    DISPLAY_SORT_OPTIONS=(-k 1,1)
+    # Sort output after package download size (decreasing):
+    #DISPLAY_SORT_OPTIONS=(-k 3,3 -hr)
+    while read -r line; do
+        [ -z "$line" ] && continue
+        pkg="$(echo "$line" | cut -d' ' -f1)"
+        ver="$(echo "$line" | cut -d' ' -f2)"
+        size="$(echo "$line" | cut -d' ' -f3)"
+        printf '%s%-40s %-20s %10s\n' "$aptfast_prefix" "$pkg" "$ver" "$size"
+    done <<<"$(echo -e "$DOWNLOAD_DISPLAY" | sort "${DISPLAY_SORT_OPTIONS[@]}")"
+  fi
+  msg "Download size: $(echo "$DOWNLOAD_SIZE" | numfmt --to=iec-i --suffix=B)" "normal"
+}
+
+# Create and insert a PID number to lockfile.
+_create_lock
+
+# Make sure aria2c (in general first parameter from _DOWNLOADER) is available.
+CMD="$(echo "$_DOWNLOADER" | sed 's/^\s*\([^ ]\+\).*$/\1/')"
+if [ ! "$(command -v "$CMD")" ]; then
+  msg "Command not found: $CMD" "normal" "err"
+  msg "You must configure $CONFFILE to use aria2c or another supported download manager" "normal" "err"
+  exit 1
+fi
+
+# Make sure package manager is available.
+if [ ! "$(command -v "$_APTMGR")" ]; then
+  msg "\`$_APTMGR\` command not available." "warning"
+  msg "You must configure $CONFFILE to use either apt-get or aptitude." "normal" "err"
+  exit 1
+fi
+
+# Disable script warning if apt is used.
+APT_SCRIPT_WARNING=()
+if [ "$_APTMGR" == "apt" ]; then
+    APT_SCRIPT_WARNING=(-o "Apt::Cmd::Disable-Script-Warning=true")
+fi
+
+# Set supported hash algorithms by aria2c (and also by Debian repository).
+SHA512_SUPPORTED=
+SHA256_SUPPORTED=
+SHA1_SUPPORTED=
+MD5sum_SUPPORTED=
+HASH_SUPPORTED=
+if [ "$CMD" == "aria2c" ]; then
+  for supported_hash in $(LC_ALL=C aria2c -v | sed '/^Hash Algorithms:/!d; s/\(^Hash Algorithms: \|,\)\+//g'); do
+    case "$supported_hash" in
+      sha-512) SHA512_SUPPORTED=y; HASH_SUPPORTED=y ;;
+      sha-256) SHA256_SUPPORTED=y; HASH_SUPPORTED=y ;;
+      sha-1)   SHA1_SUPPORTED=y;   HASH_SUPPORTED=y ;;
+      md5)     MD5sum_SUPPORTED=y; HASH_SUPPORTED=y ;;
+    esac
+  done
+  if [ -z "$HASH_SUPPORTED" ]; then
+    msg "Couldn't find supported checksum algorithm from aria2c. Checksums disabled." "warning"
+  fi
+fi
+
+# Check if "assume yes" switch is enabled and if yes enable $DOWNLOADBEFORE.
+# Also check if "download only" switch is enabled.
+#TODO: Get real value over APT items APT::Get::Assume-Yes and
+#      APT::Get::Assume-No .
+#      Respectively Aptitude::CmdLine::Download-Only and APT::Get::Download-Only.
+DOWNLOAD_ONLY=
+while true; do
+  while getopts ":dy-:" optchar; do
+    case "${optchar}" in
+      -)
+        case "${OPTARG}" in
+          yes | assume-yes)  DOWNLOADBEFORE=true ;;
+          assume-no)         DOWNLOADBEFORE=     ;;
+          download-only)     DOWNLOAD_ONLY=true  ;;
+        esac
+        ;;
+      y)
+        DOWNLOADBEFORE=true
+        ;;
+      d)
+        DOWNLOAD_ONLY=true
+        ;;
+    esac
+  done
+  ((OPTIND++))
+  [ $OPTIND -gt $# ] && break
+done
+
+# Configure proxies. Use apt values over environment variables.
+# Note: If proxy setting is not set, there is no apt-config output.
+#       Therefore variable doesn't get overriden, which is intended.
+# Export the variables to make them available in subshells (aka the
+# downloader command).
+eval "$(apt-config shell ftp_proxy Acquire::ftp::proxy)"
+export ftp_proxy
+eval "$(apt-config shell http_proxy Acquire::http::proxy)"
+export http_proxy
+eval "$(apt-config shell https_proxy Acquire::https::proxy)"
+export https_proxy
+
+# aria2 has no socks support (see https://github.com/aria2/aria2/issues/153)
+if echo "$http_proxy" | grep -q "^socks5h://" || echo "$https_proxy" | grep -q "^socks5h://"; then
+  msg "Socks proxy detected. Falling back to ${_APTMGR}" "hint"
+  "${_APTMGR}" "${APT_SCRIPT_WARNING[@]}" "$@"
+  exit 0
+fi
+
+# Run actions.
+if [ "$option" == "install" ]; then
+  msg
+  msg "Working... this may take a while." "normal"
+  REMOVE_WORKING_MESSAGE=y
+
+  get_uris "$@"
+
+  [ -t 1 ] && [ -n "$REMOVE_WORKING_MESSAGE" ] && tput cuu 1 && tput el && tput cuu 1
+  # Test /tmp/apt-fast.list file exists and not just the apt-fast comment line.
+  # Then download all files from the list.
+  if [ -f "$DLLIST" ] && [ "$(wc -l "$DLLIST" | cut -d' ' -f1)" -gt 1 ] && [ ! "$DOWNLOADBEFORE" ]; then
+    display_downloadfile
+    msg
+    msg "Do you want to download the packages? [Y/n] " "question"
+
+    while ((!updsys)); do
+      read -r -sn1 -t "$APT_FAST_TIMEOUT" answer || { msg; msg "Timed out." "warning"; exit 1; }
+      case "$answer" in
+        [JjYy])    result=1; updsys=1 ;;
+        [Nn])      result=0; updsys=1 ;;
+        "")        result=1; updsys=1 ;;
+        *)         updsys=0 ;;
+      esac
+    done
+  else
+    result=1
+  fi
+
+  if ((DOWNLOAD_SIZE)); then
+    msg
+    # Continue if answer was right or DOWNLOADBEFORE is enabled.
+    if ((result)); then
+      if [ -s "$DLLIST" ]; then
+        # Test if apt-fast directory is present where we put packages.
+        if [ ! -d "$DLDIR" ]; then
+          mkdir -p -- "$DLDIR"
+        fi
+
+        cd "$DLDIR" &>/dev/null || exit 1
+
+        eval "${_DOWNLOADER}"  # execute downloadhelper command
+        if [ "$(find "$DLDIR" -printf . | wc -c)" -gt 1 ]; then
+          # Move all packages to the apt install directory by force to ensure
+          # already existing debs which may be incomplete are replaced
+          find . -type f -name "*.deb" -execdir mv -ft "$APTCACHE" {} \+
+        fi
+        cd - &>/dev/null || msg "Failed to change back directory" "warning"
+      fi
+    else
+      exit 1
+    fi
+  else
+    [ -t 1 ] && tput el
+  fi
+
+  if [ -z "$DOWNLOAD_ONLY" ] || [ "$_APTMGR" == "aptitude" ]; then
+    "${_APTMGR}" "${APT_SCRIPT_WARNING[@]}" "$@"
+  fi
+
+
+elif [ "$option" == "clean" ]; then
+  "${_APTMGR}" "${APT_SCRIPT_WARNING[@]}" "$@" && {
+    find "$DLDIR" -maxdepth 1 -type f -delete
+    CLEANUP_STATE="$?"
+    [ -f "$DLLIST" ] && rm -f -- "$DLLIST"* || true
+  }
+
+elif [ "$option" == "download" ]; then
+  msg
+  msg "Working... this may take a while." "normal"
+  REMOVE_WORKING_MESSAGE=y
+
+  get_uris "$@"
+
+  [ -t 1 ] && [ -n "$REMOVE_WORKING_MESSAGE" ] && tput cuu 1 && tput el && tput cuu 1
+
+  if [ -f "$DLLIST" ] && [ "$(wc -l "$DLLIST" | cut -d' ' -f1)" -gt 1 ]; then
+    display_downloadfile
+    eval "${_DOWNLOADER}"
+  fi
+
+  if [ "$_APTMGR" == "aptitude" ]; then
+    "${_APTMGR}" "$@"
+  fi
+
+elif [ "$option" == "source" ]; then
+  msg
+  msg "Working... this may take a while." "normal"
+  REMOVE_WORKING_MESSAGE=y
+
+  get_uris "$@"
+
+  [ -t 1 ] && [ -n "$REMOVE_WORKING_MESSAGE" ] && tput cuu 1 && tput el && tput cuu 1
+
+  if [ -f "$DLLIST" ] && [ "$(wc -l "$DLLIST" | cut -d' ' -f1)" -gt 1 ]; then
+    display_downloadfile
+    eval "${_DOWNLOADER}"
+  fi
+  # We use APT manager here to provide more verbose output. This method is
+  # slightly slower then extractiong packages manually after download but also
+  # more hardened (e.g. some options like --compile are available).
+  "${_APTMGR}" "${APT_SCRIPT_WARNING[@]}" "$@"
+  # Uncomment following snippet to extract source directly and comment
+  # both lines before.
+  #while read srcfile; do
+  #  # extract only .dsc files
+  #  echo "$srcfile" | grep -q '\.dsc$' || continue
+  #  dpkg-source -x "$(basename "$srcfile")"
+  #done < "$DLLIST"
+
+# Execute package manager directly if unknown options are passed.
+else
+  "${_APTMGR}" "${APT_SCRIPT_WARNING[@]}" "$@"
+fi
+
+# After error or all done remove our lockfile (done with EXIT trap)

tool/aptss

@@ -1,4 +1,6 @@
-#/bin/bash
+#!/bin/bash
+
+
 
 if [ ! -e "/tmp/aptss-conf/apt-fast.conf" ];then
 ###刷新apt-fast配置
@@ -14,17 +16,8 @@ fi
 
 
 
-
-
-
-
 if  [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] ; then
 
-DEPEND=`which  apt-fast`
-if [ "$DEPEND" = "" ] ; then 
-echo "未安装依赖：ss-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 ss-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"
 
@@ -32,21 +25,16 @@ sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sou
 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 
+                /opt/durapps/spark-store/bin/apt-fast/ss-apt-fast "$@" --allow-downgrades 
 
 
 elif [ "$1" = "download" ];then
-DEPEND=`which  apt-fast`
-if [ "$DEPEND" = "" ] ; then 
-echo "未安装依赖：ss-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 ss-apt-fast -y 
-fi
 
 ###执行
 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 
+                /opt/durapps/spark-store/bin/apt-fast/ss-apt-fast "$@" --allow-downgrades 
 
 
 elif [ "$1" = "policy" ] || [ "$1" = "search" ];then

tool/password-check/ss-certificate-passwd

@@ -1,17 +0,0 @@
-#!/bin/bash
-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

tool/ssinstall

@@ -1,8 +1,20 @@
 #!/bin/bash
-#将来可能可以换成apt-metalink来直接用种子/链接下载
 
 echo "Spark Store Install script.星火商店安装脚本"
 
+function pkexec_as_current_user() {
+    #Detect the name of the display in use
+    local display=":$(ls /tmp/.X11-unix/* | sed 's#/tmp/.X11-unix/X##' | head -n 1)"
+
+    #Detect the user using such display
+    local user=$(who | grep '('$display')' | awk '{print $1}' | head -n 1)
+
+    #Detect the id of the user
+    local uid=$(id -u $user)
+
+    sudo -u $user DISPLAY=$display DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus pkexec "$@"
+}
+
 #################检测文件是否存在
 if [ $# -eq 0 ];then
 echo "没有接收到参数，退出"
@@ -15,71 +27,38 @@ then
 	echo "文件不存在"
 	exit 1
 fi
-#################root校验+要密码
-if [ "$(id -u)" != "0" ]
-then
-    echo "ssinstall需要在root下运行";
-	uname=`whoami`
-	echo "Now input the password of $uname"
-	read -e upass
-	################检查密码对不对
-    echo "$upass" | sudo -S echo "i love amber forever"
-	passcheck=`echo "$upass" | sudo -S echo "i love amber forever"`
-	if [ "$passcheck" != "i love amber forever" ];then
-	echo "-----------------------------------------------------"
-	echo "E:密码错误,退出脚本！"
-	exit 1		
-	fi
-fi
 
-
-
-
-
-
-
-##################apt-fast/metalink测试
-DEPEND="这里一定会安装所以放弃处理"
-
-##############判断是否是root运行，如果是，则正常走；如果不是，则代输密码
 if [ "$(id -u)" != "0" ];then
 #############################无root权限时
-
-IS_INSTALLED=`which apt-fast`
-if [ "$IS_INSTALLED" = "" ] ; then 
-echo "未安装依赖：ss-apt-fast 开始安装"
-echo "$upass" | sudo -S aptss ssupdate && echo "$upass" | sudo -S 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 ss-apt-fast -y 
-
+echo "请使用root启动ssinstall"
+exit 1
 fi
 
+###
 
-if  [ "$DEPEND" != "" ]; then
-echo "检测到apt-fast，使用aptss进行多线程下载加速"
-echo ----------------------------------------------------------------------------------
-echo "$upass" | sudo -S dpkg -i $1 || sudo aptss install -yf 
+
+if [ ! -e "/var/lib/apt/lists/d.store.deepinos.org.cn_Packages" ];then
+echo "接收星火仓库软件信息中..."
+aptss ssupdate
 fi
 
+echo "正在计算hash并与星火仓库匹配..."
 
+DEB_MD5SUM=`md5sum "$1" | cut -c -32`
 
+IS_MD5SUM_CHECKD=`cat /var/lib/apt/lists/d.store.deepinos.org.cn_Packages | grep $DEB_MD5SUM`
+if [ ! -z "$IS_MD5SUM_CHECKD" ];then
 
+echo "校验成功，开始安装"
+echo  ----------------------------------------------------------------------------------
+dpkg -i "$1" || aptss install -yf 
 
 else
-###########################有root权限时
-
-IS_INSTALLED=`which apt-fast`
-if [ "$IS_INSTALLED" = "" ] ; then 
-echo "未安装依赖：ss-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 ss-apt-fast -y 
-fi
-
-
-if  [ "$DEPEND" != "" ]; then
-echo "检测到apt-fast，使用aptss进行多线程下载加速"
-echo ----------------------------------------------------------------------------------
-dpkg -i $1 || aptss install -yf 
-fi
-
 
+echo "校验失败，该deb不是星火已经上架的软件包，这可能是因为你正在尝试安装一个尚未上架的软件包"
+echo "如果你是审核人员，这是正常的"
+echo "为确保安全，将会询问密码"
 
+pkexec_as_current_user bash -c "dpkg -i "$1" || aptss install -yf "
 
 fi

tool/update-upgrade/ss-do-upgrade-worker.sh

@@ -1,26 +1,39 @@
 #!/bin/bash
-if [ "$(id -u)" != "0" ];then
-pkexec "$0" "$@"
-exit
+if [ "$(id -u)" != "0" ] ; then
+	pkexec "$0" "$@"
+	exit
 fi
 
-
 case $1 in 
 	ssupdate)
-	aptss ssupdate 2>&1 | tee /tmp/spark-store-app-ssupdate-log.txt
-	IS_SSUPDATE_ERROR=`cat /tmp/spark-store-app-ssupdate-log.txt | grep "E: "`
-	echo "$IS_SSUPDATE_ERROR" > /tmp/spark-store-app-ssupdate-status.txt
+		aptss ssupdate 2>&1 | tee /tmp/spark-store-app-ssupdate-log.txt
+		IS_SSUPDATE_ERROR=`cat /tmp/spark-store-app-ssupdate-log.txt | grep "E: "`
+		echo "$IS_SSUPDATE_ERROR" > /tmp/spark-store-app-ssupdate-status.txt
 	;;
+
 	upgradable-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
+		output=$(env LANGUAGE=en_US 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="/dev/null" -o APT::Get::List-Cleanup="0" | awk NR\>1)
+
+		IFS_OLD="$IFS"
+		IFS=$'\n'
+
+		for line in $output ; do
+			PKG_NAME=$(echo $line | awk -F '/' '{print $1}')
+			PKG_NEW_VER=$(echo $line | awk -F ' ' '{print $2}')
+			PKG_CUR_VER=$(echo $line | awk -F ' ' '{print $6}' | awk -F ']' '{print $1}')
+			echo "${PKG_NAME} ${PKG_NEW_VER} ${PKG_CUR_VER}"
+		done
+
+		IFS="$IFS_OLD"
 	;;
+
 	upgrade-app)
-	aptss install "${@:2}" --only-upgrade 2>&1 | tee /tmp/spark-store-app-upgrade-log.txt
-	IS_UPGRADE_ERROR=`cat /tmp/spark-store-app-upgrade-log.txt | grep "Package manager quit with exit code."`
-	echo "$IS_UPGRADE_ERROR" > /tmp/spark-store-app-upgrade-status.txt
+		aptss install "${@:2}" --only-upgrade 2>&1 | tee /tmp/spark-store-app-upgrade-log.txt
+		IS_UPGRADE_ERROR=`cat /tmp/spark-store-app-upgrade-log.txt | grep "Package manager quit with exit code."`
+		echo "$IS_UPGRADE_ERROR" > /tmp/spark-store-app-upgrade-status.txt
 	;;
 	
 	clean-log)
-	rm -f /tmp/spark-store-app-ssupdate-status.txt /tmp/spark-store-app-ssupdate-log.txt /tmp/spark-store-app-upgrade-log.txt /tmp/spark-store-app-upgrade-status.txt
+		rm -f /tmp/spark-store-app-ssupdate-status.txt /tmp/spark-store-app-ssupdate-log.txt /tmp/spark-store-app-upgrade-log.txt /tmp/spark-store-app-upgrade-status.txt
 	;;
 esac

tool/update-upgrade/ss-do-upgrade.sh

@@ -1,58 +1,81 @@
 #!/bin/bash
 
 touch /tmp/spark-store/upgradeStatus.txt
-pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh ssupdate | zenity --progress --auto-close --pulsate --no-cancel  --text="正在检查更新，请稍候..." --height 70 --width 400 --title="星火商店更新模块" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
 
-if [ -z `cat /tmp/spark-store-app-ssupdate-status.txt` != "0" ];then
-echo "无错误"
+# 执行 apt update
+pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh ssupdate | zenity --progress --auto-close --pulsate --no-cancel --text="正在检查更新，请稍候..." --height 70 --width 400 --title="星火商店更新模块" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+
+if [ -z `cat /tmp/spark-store-app-ssupdate-status.txt` ] ; then
+	echo "无错误"
+	pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh clean-log
 else
-zenity --error  --text "检查更新进程出现错误！按确定查看报错，可用于反馈" --title "星火商店更新检测模块" --height 200 --width 350 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
-zenity --text-info --filename=/tmp/spark-store-app-ssupdate-log.txt --checkbox="我已复制了此文本框中的日志，且将会在反馈时附上 。反馈渠道可以在右上角菜单的设置中找到" --title="反馈渠道在商店右上角的设置里" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
-pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh clean-log
-exit 
+	zenity --error --text "检查更新进程出现错误！按确定查看报错，可用于反馈" --title "星火商店更新检测模块" --height 200 --width 350 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+	zenity --text-info --filename=/tmp/spark-store-app-ssupdate-log.txt --checkbox="我已复制了此文本框中的日志，且将会在反馈时附上。反馈渠道可以在右上角菜单的设置中找到" --title="反馈渠道在商店右上角的设置里" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+	pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh clean-log
+	exit
 fi
-pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh clean-log
 
-PKG_LIST="$(pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgradable-list)" 
-####如果没更新，就弹出不需要更新
-if [ -z "$PKG_LIST" ];then
-zenity --info  --text "没有软件需要更新\n但是你并没有站在世界之巅" --title "星火商店更新检测模块" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+# 获取可更新应用列表
+PKG_LIST="$(pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgradable-list)"
+## 如果没更新，就弹出不需要更新
+if [ -z "$PKG_LIST" ] ; then
+	zenity --info --text "没有软件需要更新\n但是你并没有站在世界之巅" --title "星火商店更新检测模块" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
 else
-PKG_UPGRADE_LIST=`for PKG_NAME in $PKG_LIST;
-do
-#### 检测是否是hold状态
-	if [ "$(dpkg-query -W -f='${Status}' $PKG_NAME | grep hold)" = "" ];then
-       echo "true"
-       echo "$PKG_NAME"
-       echo "$PKG_NAME"
-	else
-	echo "false"
-	echo "$PKG_NAME（无法更新：已被标记为保留）"
-	echo "$PKG_NAME"
+	## 获取用户选择的要更新的应用
+	### 指定分隔符为 \n
+	IFS_OLD="$IFS"
+	IFS=$'\n'
+
+	PKG_UPGRADE_LIST=`for line in $PKG_LIST ; do
+	PKG_NAME=$(echo $line | awk -F ' ' '{print $1}')
+	PKG_NEW_VER=$(echo $line | awk -F ' ' '{print $2}')
+	PKG_CUR_VER=$(echo $line | awk -F ' ' '{print $3}')
+
+	dpkg --compare-versions $PKG_NEW_VER le $PKG_CUR_VER
+	if [ $? -eq 0 ] ; then
+		continue
 	fi
-done | zenity --list --text="选择你想更新的应用" --column=是否更新 --column=应用包名 --column="真的应用包名" --separator=" " --checklist --print-column=3 --multiple --height 350 --width 550 --hide-column=3 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg` 
+	#### 检测是否是 hold 状态
+	PKG_STA=$(dpkg-query -W -f='${db:Status-Want}' $PKG_NAME)
+	if [ "$PKG_STA" != "hold" ] ; then
+		echo "true"
+		echo "$PKG_NAME"
+		echo "$PKG_NEW_VER"
+		echo "$PKG_CUR_VER"
+	else
+		echo "false"
+		echo "$PKG_NAME（无法更新：已被标记为保留）"
+		echo "$PKG_NEW_VER"
+		echo "$PKG_CUR_VER"
+	fi
+done`
 
-#### 如果没有选择，则直接退出
+	### 还原分隔符
+	IFS="$IFS_OLD"
 
-if [ "$PKG_UPGRADE_LIST" = "" ];then
-zenity --info  --text "没有选中任何软件\n但是你并没有站在世界之巅" --title "星火商店更新检测服务" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
-else
-
-pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgrade-app $PKG_UPGRADE_LIST -y | zenity --progress --auto-close --no-cancel --pulsate --text=正在更新已选中的应用，请稍候... --height 70 --width 400 --title="星火商店更新模块" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
-
-if [ -z "`cat /tmp/spark-store-app-upgrade-status.txt`"  ];then
-
-zenity --info  --text "选中的软件已经更新完毕" --title "星火商店更新检测模块" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
-else
-zenity --error  --text "更新出现错误！按确定查看报错，可用于反馈" --title "星火商店更新检测模块" --height 200 --width 350 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
-zenity --text-info --filename=/tmp/spark-store-app-upgrade-log.txt --checkbox="我已复制了此文本框中的日志，且将会在反馈时附上 。反馈渠道可以在右上角菜单的设置中找到" --title="反馈渠道在商店右上角的设置里往下拉" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
-fi
-
-
-
-fi
+	## 如果没有应用需要更新，则直接退出
+	if [ -z "$PKG_UPGRADE_LIST" ] ; then
+		zenity --info --text "没有软件需要更新\n但是你并没有站在世界之巅" --title "星火商店更新检测服务" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+	else
+		PKG_UPGRADE_LIST=$(echo "$PKG_UPGRADE_LIST" | zenity --list --text="选择你想更新的应用" --column="是否更新" --column="包名" --column="新版本" --column="从该版本更新" --separator=" " --checklist --multiple --print-column=2 --height 350 --width 550 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg)
+		## 如果没有选择，则直接退出
+		if [ -z "$PKG_UPGRADE_LIST" ] ; then
+			zenity --info --text "没有选中任何软件\n但是你并没有站在世界之巅" --title "星火商店更新检测服务" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+		else
+			### 更新用户选择的应用
+			pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgrade-app $PKG_UPGRADE_LIST -y | zenity --progress --auto-close --no-cancel --pulsate --text="正在更新已选中的应用，请稍候..." --height 70 --width 400 --title="星火商店更新模块" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
 
+			#### 更新成功
+			if [ -z "`cat /tmp/spark-store-app-upgrade-status.txt`" ] ; then
+				zenity --info --text "选中的软件已经更新完毕" --title "星火商店更新检测模块" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+			else
+			#### 更新异常
+				zenity --error --text "更新出现错误！按确定查看报错，可用于反馈" --title "星火商店更新检测模块" --height 200 --width 350 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+				zenity --text-info --filename=/tmp/spark-store-app-upgrade-log.txt --checkbox="我已复制了此文本框中的日志，且将会在反馈时附上 。反馈渠道可以在右上角菜单的设置中找到" --title="反馈渠道在商店右上角的设置里往下拉" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+			fi
+		fi
+	fi
 fi
 
 rm -f touch /tmp/spark-store/upgradeStatus.txt
-####从最开头
+# 从最开头

tool/update-upgrade/ss-update-controler.sh

@@ -13,14 +13,9 @@ 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
 
-option=`zenity --list --text="欢迎使用星火更新和安装设置工具\n请在以下操作中选择一个进行~" --column 数字 --column=操作选项  --print-column=2  --height 350 --width 760 0 "查看自动更新相关功能使用前须知（重要）" 1 "$text_update_open星火更新检测工具(如果开启则会在系统启动后自动检测更新。如有更新则会弹出通知)" 2 查看可更新软件包列表并决定是否更新 3 "$text_auto_install_open点击安装免输入密码功能" 4 退出脚本 --hide-column=1 --print-column=1` 
+
+option=`zenity --list --text="欢迎使用星火更新和安装设置工具\n请在以下操作中选择一个进行~" --column 数字 --column=操作选项  --print-column=2  --height 350 --width 760 0 "查看自动更新相关功能使用前须知（重要）" 1 "$text_update_open星火更新检测工具(如果开启则会在系统启动后自动检测更新。如有更新则会弹出通知)" 2 查看可更新软件包列表并决定是否更新  4 退出脚本 --hide-column=1 --print-column=1` 
 
 case $option in 
 	0)
@@ -42,25 +37,7 @@ case $option in
 	2)
 	/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh
 	;;
-	3)
-	if [ -f /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy ];then 
-	zenity --info --icon-name=spark-store --height 150 --width 200 --text   "---检测到已经启动了免输入密码，执行关闭" --timeout=2 
-	pkexec rm /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
-	zenity --info --icon-name=spark-store --height 150 --width 200 --text   "已关闭" --timeout=2 
-	else
 
-	is_accept_polkiy=`zenity --list  --height 350 --width 300 --text "请注意：这个功能尚未开发完成，一旦开启，则运行pkexec ssinstall时不再需要授权\n仅对星火内置安装器生效\n理论上会存在一定的安全风险" --column 数字 --column=操作选项 --hide-column=1 --print-column=1 1 同意 2 拒绝`
-
-
-
-if [ "$is_accept_polkiy" = "1" ];then
-	pkexec 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
-	zenity --info --icon-name=spark-store --height 150 --width 200 --text  "---已启动"
-	else
-	zenity --info --icon-name=spark-store --height 150 --width 200 --text  "---未同意，返回"
-fi
-fi
-	;;
 	4)
 	exit 0
 	;;

tool/update-upgrade/ss-update-notifier.sh

@@ -1,96 +1,93 @@
 #!/bin/bash
-set -e
-LANG=en.US
+LANGUAGE=en_US
 
+# 发送通知
 function notify-send() {
-    #Detect the name of the display in use
+    # Detect name of the display in use
     local display=":$(ls /tmp/.X11-unix/* | sed 's#/tmp/.X11-unix/X##' | head -n 1)"
 
-    #Detect the user using such display
+    # Detect user using the display
     local user=$(who | grep '('$display')' | awk '{print $1}' | head -n 1)
 
-    #Detect the id of the user
+    # Detect uid of the user
     local uid=$(id -u $user)
 
-    sudo -u $user DISPLAY=$display DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus notify-send "$@"
+    sudo -u $user DISPLAY=$display DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus notify-send "$@"
 }
 
-#检测网络链接畅通
+# 检测网络链接畅通
 function network()
 {
-    #超时时间
+    # 超时时间
     local timeout=15
 
-    #目标网站
+    # 目标网站
     local target=www.baidu.com
 
-    #获取响应状态码
+    # 获取响应状态码
     local ret_code=`curl -I -s --connect-timeout ${timeout} ${target} -w %{http_code} | tail -n1`
 
-    if [ "x$ret_code" = "x200" ]; then
-        #网络畅通
+    if [ "x$ret_code" = "x200" ] ; then
+        # 网络畅通
         return 0
     else
-        #网络不畅通
+        # 网络不畅通
         return 1
     fi
-
-    return 0
 }
 
 network
-if [ $? -eq 1 ];then
-	echo "Network fail. Stop to avoid bother dpkg"
-	exit -1
+if [ $? -ne 0 ] ; then
+    echo "Network fail. Stop to avoid bother dpkg"
+    exit -1
 fi
 
-#The code above is modified from https://blog.csdn.net/yaxuan88521/article/details/120516298
+# The code above is modified from https://blog.csdn.net/yaxuan88521/article/details/120516298
 
-curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list"
 # 每日更新星火源文件
-mkdir -p /etc/apt/preferences.d
-touch /etc/apt/preferences.d/sparkstore
-cat << EOF >/etc/apt/preferences.d/sparkstore
-Package: *
-Pin: origin *.deepinos.org.cn
-Pin-Priority: 100
-
-EOF
+curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list"
 
 updatetext=`aptss ssupdate`
-
-rm /etc/apt/preferences.d/sparkstore
-
-
 isupdate=`echo ${updatetext: -5}`
-if [ "$isupdate" = "date." ];then
-exit 0 
+if [ "$isupdate" = "date." ] ; then
+    exit 0
 fi
-#### 从这里开始，只有检测到了更新才会进行
 
+## 从这里开始，只有检测到了更新才会进行
 update_app_number=`echo ${updatetext%package*} #从右向左截取第一个 src 后的字符串`
 update_app_number=`echo ${update_app_number##*information...}`
 
+# 获取用户选择的要更新的应用
+PKG_LIST="$(/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgradable-list)"
+# 指定分隔符为 \n
+IFS_OLD="$IFS"
+IFS=$'\n'
 
-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)" 
+for line in $PKG_LIST ; do
+    PKG_NAME=$(echo $line | awk -F ' ' '{print $1}')
+    PKG_NEW_VER=$(echo $line | awk -F ' ' '{print $2}')
+    PKG_CUR_VER=$(echo $line | awk -F ' ' '{print $3}')
 
+    dpkg --compare-versions $PKG_NEW_VER le $PKG_CUR_VER
 
+    if [ $? -eq 0 ] ; then
+        let update_app_number=$update_app_number-1
+        continue
+    fi
 
-for PKG_NAME in $PKG_LIST;do
-if [ "$(dpkg-query -W -f='${Status}' $PKG_NAME | grep hold)" != "" ];then
-       let update_app_number=$update_app_number-1
-	echo $update_app_number
-	echo $PKG_NAME 
-fi
+    ## 检测是否是 hold 状态
+    PKG_STA=$(dpkg-query -W -f='${db:Status-Want}' $PKG_NAME)
+    if [ "$PKG_STA" = "hold" ] ; then
+        let update_app_number=$update_app_number-1
+    fi
 done
 
+# 还原分隔符
+IFS="$IFS_OLD"
 
-
-if [ $update_app_number -lt 1 ];then
-exit
+if [ $update_app_number -le 0 ] ; then
+    exit 0
 fi
-#### 如果都是hold的那就直接退出，否则把剩余的给提醒了
-
-notify-send -i spark-store "星火更新提醒" "星火商店仓库中有$update_app_number个软件包可以更新啦！请到星火商店的菜单处理"
-
 
+## 如果都是hold或者版本一致的那就直接退出，否则把剩余的给提醒了
+notify-send -a spark-store "星火更新提醒" "星火商店仓库中有$update_app_number个软件包可以更新啦！请到星火商店的菜单处理"