diff --git a/src/main.cpp b/src/main.cpp index 3e4e977..ea7e452 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -120,11 +120,6 @@ int main(int argc, char *argv[]) //在cmakelist.txt中设置 buildDateTime QString buildDateTime = QString("%1-%2").arg(QString(BUILD_DATE)).arg(QString(BUILD_TIME)); - Utils::writeLog("INFO", QString("Build datetime: %1").arg(buildDateTime)); - - // NOTE: 提前设置组织名称和应用名称,避免配置文件位置错误 - DApplication::setOrganizationName("spark-union"); - DApplication::setApplicationName("spark-store"); Application::checkAppConfigLocation(); // 检查 ~/.config/spark-union/spark-store 文件夹是否存在 // 初始化 config.ini 配置文件 diff --git a/tool/apt-fast/ss-apt-fast b/tool/apt-fast/ss-apt-fast index 57e10fa..38fb0ef 100755 --- a/tool/apt-fast/ss-apt-fast +++ b/tool/apt-fast/ss-apt-fast @@ -458,7 +458,17 @@ get_uris(){ msg "Failed to create tmp dir" "warning" msg "无法创建临时目录" "warning" exit 1 + + } + +cleanup_tmpdir() { + if [ -n "$tmpdir" ] && [ -d "$tmpdir" ]; then + rm -rf "$tmpdir" + fi +} +trap cleanup_tmpdir EXIT + ## --print-uris format is: # 'fileurl' filename filesize checksum_hint:filechecksum # 修改:process_package函数增加第二个参数表示当前线程的临时输出文件 @@ -580,6 +590,9 @@ get_uris(){ rm -f "$thread_file" fi done + # 清理临时目录 + cleanup_tmpdir + trap - EXIT # 移除临时目录的陷阱 # 合并显示信息 if [ -f "$tmpdir/display" ]; then diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index 1cf2c9d..dc19457 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -27,43 +27,37 @@ <html><head/><body><p>Capable to deepin 23</p></body></html> - 兼容 Deepin 23 - 兼容 Deepin 23 + <html><head/><body><p>This app can only be installed natively</p></body></html> - 该应用只能在本机原生环境中安装 - 该应用只能在本机原生环境中安装 + <html><head/><body><p>This app will be installed to debian12 ACE</p></body></html> - 此应用将会被安装到ACE Debian12兼容环境 - 此应用将会被安装到ACE Debian12兼容环境 + <html><head/><body><p>This app will be installed to debian13 ACE</p></body></html> - 此应用将会被安装到ACE Debian13兼容环境 - 此应用将会被安装到ACE Debian13兼容环境 + <html><head/><body><p>This app will be installed to debian SID ACE</p></body></html> - 此应用将会被安装到ACE Debian SID兼容环境 - 此应用将会被安装到ACE Debian SID兼容环境 + <html><head/><body><p>This app will be installed to deepin23 ACE</p></body></html> - 此应用将会被安装到ACE Deepin 23兼容环境 - 此应用将会被安装到ACE Deepin 23兼容环境 + @@ -539,8 +533,7 @@ <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><span style=' font-size:10pt;font-weight:60;'>Sparky is our mascot, designed by <a href='https://tai3.cn/'>Tyson Tan</a></span><br/> - <span style=' font-size:10pt;font-weight:60;'>由社区打造的应用商店</span><br/><span style=' font-size:10pt;font-weight:60;'>Sparky 是我们的吉祥物。设计源于 <a href='https://tai3.cn/'>Tyson Tan</a></span><br/> - <span style=' font-size:10pt;font-weight:60;'>由社区打造的应用商店</span><br/><span style=' font-size:10pt;font-weight:60;'>Sparky 是我们的吉祥物。设计源于<a href='https://tai3.cn/'>Tyson Tan</a></span><br/> +