diff --git a/debian/changelog b/debian/changelog index 9e1bb8d5aef9e1651c69fdf316738b3ffef2c72c..5cb748e046bd09440522d77572ddc5f36157ebdc 100644 --- a/debian/changelog +++ b/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 Tue, 28 Aug 2025 01:03:08 +0800 + + + +spark-store (4.8.1-1) UNRELEASED; urgency=medium * 修复更新器安装软件完成后仍然显示下载完成的问题 + * 修复一些aptss锁定失败bug -- momen Tue, 28 Aug 2025 01:03:08 +0800 diff --git a/pkg/usr/share/icons/hicolor/scalable/apps/spark-store.png b/pkg/usr/share/icons/hicolor/scalable/apps/spark-store.png new file mode 100644 index 0000000000000000000000000000000000000000..bc47ff0be4b5ec4d0c5a5907a2a63190d4bd2572 Binary files /dev/null and b/pkg/usr/share/icons/hicolor/scalable/apps/spark-store.png differ diff --git a/pkg/usr/share/icons/hicolor/scalable/apps/spark-store.svg b/pkg/usr/share/icons/hicolor/scalable/apps/spark-store.svg deleted file mode 100644 index a84891b75c05348e2aea6f95df77c93bc992bea7..0000000000000000000000000000000000000000 --- a/pkg/usr/share/icons/hicolor/scalable/apps/spark-store.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icon/spark-store.svg b/src/assets/icon/spark-store.svg index a84891b75c05348e2aea6f95df77c93bc992bea7..a1f93964e7a6f1769518cf633ac1bc2870cb1cfd 100644 --- a/src/assets/icon/spark-store.svg +++ b/src/assets/icon/spark-store.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/spark-update-tool/src/appdelegate.cpp b/src/spark-update-tool/src/appdelegate.cpp index 4efbc4671f9c76fa85823d200566c17f95fe53c4..7db37ffa52a9716e496640ade759c95a4049e0fa 100644 --- a/src/spark-update-tool/src/appdelegate.cpp +++ b/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); } diff --git a/src/spark-update-tool/src/aptssupdater.cpp b/src/spark-update-tool/src/aptssupdater.cpp index f4bb6dd5de5b5cbbf395fc31ffc0bbd5c5e14cf7..71dc533a3ecb13727c7921a617ad0c301c90757c 100644 --- a/src/spark-update-tool/src/aptssupdater.cpp +++ b/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); diff --git a/tool/apt-fast/ss-apt-fast b/tool/apt-fast/ss-apt-fast index f1a07464fa17d94e96a1ab5ba0a072d764fa68a0..57e10fa8285a97cf41ee72ba838b7ef51acc7d05 100755 --- a/tool/apt-fast/ss-apt-fast +++ b/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 diff --git a/tool/ssaudit b/tool/ssaudit index 2afffe6491a547d8500b4c43f6acc3ff2235445c..ad5610ee2b23fb17f742690cc6489838ae370f98 100755 --- a/tool/ssaudit +++ b/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 diff --git a/tool/ssinstall b/tool/ssinstall index e7be005939dba394c12778899171a46206e0fa56..a1e44b6bbd2e1e58c78c95606d2b9750c5d52b2e 100755 --- a/tool/ssinstall +++ b/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