!368 4.8.2

Merge pull request !368 from shenmo/dev

debian/changelog

@@ -1,6 +1,18 @@
-spark-store (4.8.1) UNRELEASED; urgency=medium
+spark-store (4.8.2) UNRELEASED; urgency=medium
+
+  * 更新软件主图标
+  * 软件更新器更新成功后删除软件包
+  * 修复：首次安装ACE环境情况下无法正确配置ACE中aptss的问题
+  * 修复：使用aptss后在/tmp下留下垃圾的问题
+  
+ -- momen <vmomenv@gmail.com>  Tue, 28 Aug 2025 01:03:08 +0800
+
+
+
+spark-store (4.8.1-1) UNRELEASED; urgency=medium
 
   * 修复更新器安装软件完成后仍然显示下载完成的问题
+  * 修复一些aptss锁定失败bug
   
  -- momen <vmomenv@gmail.com>  Tue, 28 Aug 2025 01:03:08 +0800
 

src/spark-update-tool/src/appdelegate.cpp

@@ -317,6 +317,6 @@ void AppDelegate::startNextInstall() {
 
     // 注意参数顺序：deb路径在前，--no-create-desktop-entry在后
     QStringList args;
-    args << debPath << "--no-create-desktop-entry";
+    args << debPath << "--no-create-desktop-entry" << "--delete-after-install";
     m_installProcess->start("ssinstall", args);
 }

src/spark-update-tool/src/aptssupdater.cpp

@@ -78,7 +78,7 @@ QStringList aptssUpdater::getPackageSizes()
 
     foreach (const QString &packageName, updateablePackages) {
         // 构建新命令（包含包名参数）
-        QString command = QString("apt download %1 --print-uris -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf "
+        QString command = QString("/usr/bin/apt download %1 --print-uris -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf "
                                   "-o Dir::Etc::sourcelist=\"/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list\" "
                                   "-o Dir::Etc::sourceparts=\"/dev/null\"").arg(packageName);
 

tool/apt-fast/ss-apt-fast

@@ -55,6 +55,41 @@ msg_already_running()
 #  exit 1
 #fi
 
+# 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 -fr -- "${LISTTEMP}" 2>/dev/null
+      then
+        msg "Could not clean up download list file." "warning"
+        msg "无法清除下载列表文件." "warning"
+        CLEANUP_STATE=1
+      fi
+    fi
+  fi
+}
+
+cleanup_aptfast()
+{
+  local last_exit_code=$?
+  [ "$CLEANUP_STATE" -eq 0 ] && CLEANUP_STATE=$last_exit_code
+  cleanup_dllist
+  _remove_lock
+  # 添加删除临时目录的逻辑
+  if [ -n "$LISTTEMP" ] && [ -d "$LISTTEMP" ]; then
+    rm -rf "$LISTTEMP"
+  fi
+}
+exit_cleanup_state()
+{
+  cleanup_aptfast
+  exit $CLEANUP_STATE
+}
+
 LCK_FD=99
 # create the lock file and lock it, die on failure
 _create_lock()
@@ -289,36 +324,6 @@ fi
 
 
 
-# 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 -fr -- "${LISTTEMP}" 2>/dev/null
-      then
-        msg "Could not clean up download list file." "warning"
-        msg "无法清除下载列表文件." "warning"
-        CLEANUP_STATE=1
-      fi
-    fi
-  fi
-}
-
-cleanup_aptfast()
-{
-  local last_exit_code=$?
-  [ "$CLEANUP_STATE" -eq 0 ] && CLEANUP_STATE=$last_exit_code
-  cleanup_dllist
-  _remove_lock
-}
-
-exit_cleanup_state()
-{
-  exit $CLEANUP_STATE
-}
 
 # decode url string
 # translates %xx but must not convert '+' in spaces

tool/ssaudit

@@ -178,6 +178,7 @@ function hash_check() {
 # 确保aptss存在
 function ensure_aptss_exist() {
     if ! command -v aptss &>/dev/null; then
+        apt update
         local deb_file="/tmp/spark-store-console-in-container_latest_all.deb"
         
         if ! wget -O "$deb_file" "https://amber-ce-resource.spark-app.store/store/depends/spark-store-console-in-container_latest_all.deb"; then

tool/ssinstall

@@ -178,6 +178,7 @@ function hash_check() {
 # 确保aptss存在
 function ensure_aptss_exist() {
     if ! command -v aptss &>/dev/null; then
+        apt update
         local deb_file="/tmp/spark-store-console-in-container_latest_all.deb"
         
         if ! wget -O "$deb_file" "https://amber-ce-resource.spark-app.store/store/depends/spark-store-console-in-container_latest_all.deb"; then