Merge pull request  from shenmo/lts-3.5
This commit is contained in:
shenmo 2022-12-12 08:34:07 +00:00 committed by Gitee
commit fd3dd1d846
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 10 additions and 3 deletions

7
debian/changelog vendored

@ -1,3 +1,10 @@
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 spark-store (3.5.2) stable; urgency=medium
* fix: aptss 转为使用内置的ss-apt-fast指令 * fix: aptss 转为使用内置的ss-apt-fast指令

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

@ -20,7 +20,7 @@ DWIDGET_USE_NAMESPACE
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
// Get build time // Get build time
static const QString version = "Version 3.5.2"; 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 QDate buildDate = QLocale( QLocale::English ).toDate( QString(__DATE__).replace(" ", " 0"), "MMM dd yyyy");
static const QTime buildTime = QTime::fromString(__TIME__, "hh:mm:ss"); static const QTime buildTime = QTime::fromString(__TIME__, "hh:mm:ss");

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