!163 353

Merge pull request !163 from shenmo/lts-3.5

debian/changelog

@@ -1,3 +1,17 @@
+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 修复

debian/spark-store.postinst

@@ -29,7 +29,7 @@ case "$1" in
 		ln -s -f /opt/durapps/spark-store/bin/aptss /usr/local/bin/ss-apt-fast
 		
      	       ln -s -f /opt/durapps/spark-store/bin/aptss /usr/bin/aptss
-
+		
 		# 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/downloadworker.cpp

@@ -212,7 +212,7 @@ void DownloadController::startDownload(const QString &url)
         QProcess mailProcess;
         mailProcess.start(SenderdPath.toUtf8() + " " + metaUrl.toUtf8() + " " + "HD70642");
         mailProcess.waitForStarted();
-        mailProcess.waitForFinished(3);
+        mailProcess.waitForFinished();
         mailProcess.deleteLater();
 
 

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.5.1.1";
+    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");
 

tool/aptss

@@ -1,8 +1,6 @@
 #!/bin/bash
 
-apt-fast(){
-/opt/durapps/spark-store/bin/apt-fast/ss-apt-fast "$@"
-}
+
 
 if [ ! -e "/tmp/aptss-conf/apt-fast.conf" ];then
 ###刷新apt-fast配置
@@ -27,7 +25,7 @@ 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
@@ -36,7 +34,7 @@ elif [ "$1" = "download" ];then
 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/ssinstall

@@ -42,7 +42,7 @@ fi
 ##############判断是否是root运行，如果是，则正常走；如果不是，则代输密码
 if [ "$(id -u)" != "0" ];then
 #############################无root权限时
-----------------------------------------------------------------------------------
+echo ----------------------------------------------------------------------------------
 echo "$upass" | sudo -S dpkg -i $1 || sudo aptss install -yf