From faad17470a973c2bae281a398f904307809c65bf Mon Sep 17 00:00:00 2001 From: uniartisan Date: Mon, 27 Mar 2023 15:20:26 +0800 Subject: [PATCH 01/10] =?UTF-8?q?feat:=20=E7=BB=9F=E4=B8=80=E5=88=B0?= =?UTF-8?q?=E5=90=8C=E4=B8=80=E4=B8=AAurl=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/settingspage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settingspage.cpp b/src/pages/settingspage.cpp index 8012772..a0bf537 100644 --- a/src/pages/settingspage.cpp +++ b/src/pages/settingspage.cpp @@ -114,7 +114,7 @@ void SettingsPage::on_pushButton_updateServer_clicked() QFile::remove(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/server.list"); - auto updateSuccess = system("curl -o " + QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation).toUtf8() + "/server.list https://d.store.deepinos.org.cn/store/server-and-mirror.list"); + auto updateSuccess = system("curl -o " + QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation).toUtf8() + "/server.list " /* 注意空格的问题 */ + DEFAULT_SERVER_URL + "store/server-and-mirror.list"); qDebug() << "Update serverlist status:" << updateSuccess; if (updateSuccess != 0) // 更新失败不换服务器配置 { -- Gitee From 917527cbe6309ae8714e8158aba140af3b24ae03 Mon Sep 17 00:00:00 2001 From: uniartisan Date: Fri, 31 Mar 2023 14:32:55 +0800 Subject: [PATCH 02/10] =?UTF-8?q?fix:=20=E6=9B=B4=E6=94=B9=E6=96=87?= =?UTF-8?q?=E6=A1=88=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/settingspage.ui | 2 +- translations/spark-store_en.ts | 2 +- translations/spark-store_fr.ts | 2 +- translations/spark-store_zh_CN.ts | 4 ++-- translations/spark-store_zh_TW.ts | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/settingspage.ui b/src/pages/settingspage.ui index 6a76ab7..1d93ca8 100644 --- a/src/pages/settingspage.ui +++ b/src/pages/settingspage.ui @@ -140,7 +140,7 @@ - Take effect when restart + Take effect immediately diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts index 0bc11b6..fcfd185 100644 --- a/translations/spark-store_en.ts +++ b/translations/spark-store_en.ts @@ -565,7 +565,7 @@ - Take effect when restart + Take effect immediately diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts index 9d51d6b..90ab649 100644 --- a/translations/spark-store_fr.ts +++ b/translations/spark-store_fr.ts @@ -565,7 +565,7 @@ - Take effect when restart + Take effect immediately diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index 405056f..9396154 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -565,8 +565,8 @@ - Take effect when restart - 重启商店后生效 + Take effect immediately + 设置后立即生效 diff --git a/translations/spark-store_zh_TW.ts b/translations/spark-store_zh_TW.ts index 0d7f454..e96533b 100644 --- a/translations/spark-store_zh_TW.ts +++ b/translations/spark-store_zh_TW.ts @@ -565,8 +565,8 @@ - Take effect when restart - 重启商店后生效 + Take effect immediately + 设置后立即生效 -- Gitee From c6d3742daa4bd2c6cb51c6790cb936419ec93555 Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 31 Mar 2023 09:04:18 +0000 Subject: [PATCH 03/10] update README.md. Signed-off-by: shenmo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 046af44..8fa9475 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ If you want to submit an APP to share with others，Please [Click here](https:// If you simply want to install the Spark Store,just enter the [Release] page, find the version you want and install. -If you are using Debian11/Ubuntu 20.04, you will need extra dependency package. Available [here](https://code.gitlink.org.cn/shenmo7192/spark-store-dependencies/raw/branch/master/spark-store-dependencies-kylin.zip) +If you are using Debian11/Ubuntu 20.04, you will need extra dependency package. Available [here](https://zunyun01.store.deepinos.org.cn/spark-store-dependencies-kylin.zip) --- #### Compile and developement -- Gitee From 09b880fff8a48814be2aee6ee5ad410df566acec Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 31 Mar 2023 09:04:39 +0000 Subject: [PATCH 04/10] update README.zh.md. Signed-off-by: shenmo --- README.zh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.zh.md b/README.zh.md index 18b9099..0ee4bc3 100644 --- a/README.zh.md +++ b/README.zh.md @@ -32,7 +32,7 @@ 如果想安装 `星火应用商店` ，请打开右侧的 [Release] 页面，找到最新版本，并选择适用于当前系统的安装包下载。 -如果你在使用 `Debian 11/Ubuntu 20.04`，你需要额外下载[依赖补充包](https://code.gitlink.org.cn/shenmo7192/spark-store-dependencies/raw/branch/master/spark-store-dependencies-kylin.zip) +如果你在使用 `Debian 11/Ubuntu 20.04`，你需要额外下载[依赖补充包](https://zunyun01.store.deepinos.org.cn/spark-store-dependencies-kylin.zip) --- #### 编译安装 -- Gitee From 1506b74b01aed74b73f72c87949a3e49cd696043 Mon Sep 17 00:00:00 2001 From: shenmo Date: Sun, 9 Apr 2023 02:06:05 +0000 Subject: [PATCH 05/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E5=88=A0?= =?UTF-8?q?=E9=99=A4libc6-dev=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shenmo --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 302f969..2e62d79 100644 --- a/debian/control +++ b/debian/control @@ -42,7 +42,6 @@ Depends:${shlibs:Depends}, ${misc:Depends}, aria2, gcc, zenity, - libc6-dev, policykit-1, libnotify-bin Description: Spark Store -- Gitee From 484a82b00b995fe2ec6b447e374e71d17763bbb1 Mon Sep 17 00:00:00 2001 From: shenmo Date: Sun, 9 Apr 2023 02:30:26 +0000 Subject: [PATCH 06/10] update tool/ssinstall. Signed-off-by: shenmo --- tool/ssinstall | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tool/ssinstall b/tool/ssinstall index 94fdcc6..25bf508 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -76,18 +76,21 @@ IS_MD5SUM_CHECKD=`cat $PACKAGES_DATA_PATH | grep $DEB_MD5SUM` if [ $# -eq 0 ];then echo "没有接收到参数，退出" echo "用法：$0 deb路径" +echo "OMG-IT-GOES-WRONG" exit fi if [ ! -f "$1" ] then echo "${TRANSHELL_CONTENT_FILE_NOT_EXIST}" + echo "OMG-IT-GOES-WRONG" exit 1 fi if [ "$(id -u)" != "0" ];then #############################无root权限时 echo "${TRANSHELL_CONTENT_PLEASE_RUN_AS_ROOT}" +echo "OMG-IT-GOES-WRONG" exit 1 fi -- Gitee From 88a28c56589001ac79810ea3e25af24e5cd9313f Mon Sep 17 00:00:00 2001 From: shenmo Date: Sun, 9 Apr 2023 02:31:28 +0000 Subject: [PATCH 07/10] update debian/changelog. Signed-off-by: shenmo --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index c13e494..3ed0357 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +spark-store (4.2.5) stable; urgency=medium + * 修复：ssinstall在文件不存在时仍然报安装成功 + * 修复：删除不再需要的依赖：libc6-dev + + -- shenmo + spark-store (4.2.4) stable; urgency=medium * 修复：ssinstall校验失败的时候仍然提示安装成功 * 新增：ssinstall可以自动刷新ssupdate以防止仓库更新中导致的安装校验失败 -- Gitee From d987c840c7c414bd03a15a381a8372f24e406196 Mon Sep 17 00:00:00 2001 From: shenmo Date: Sun, 9 Apr 2023 14:03:19 +0000 Subject: [PATCH 08/10] update debian/spark-store.postinst. Signed-off-by: shenmo --- debian/spark-store.postinst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/spark-store.postinst b/debian/spark-store.postinst index 5f1009a..fba1761 100755 --- a/debian/spark-store.postinst +++ b/debian/spark-store.postinst @@ -8,8 +8,12 @@ case "$1" in echo "Enabling i386 arch..." dpkg --add-architecture i386 ;; + aarch64) + echo "Enabling armhf arch..." + sudo dpkg --add-architecture armhf + ;; *) - echo "Not amd64, skip enable i386 arch" + echo "Unknown architecture, skip enable 32-bit arch" ;; esac -- Gitee From 347c8ed093781f2ffbc8bf2a9eb89a16870f745d Mon Sep 17 00:00:00 2001 From: shenmo Date: Sun, 9 Apr 2023 14:03:31 +0000 Subject: [PATCH 09/10] update debian/spark-store.postinst. Signed-off-by: shenmo --- debian/spark-store.postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/spark-store.postinst b/debian/spark-store.postinst index fba1761..ad43268 100755 --- a/debian/spark-store.postinst +++ b/debian/spark-store.postinst @@ -10,7 +10,7 @@ case "$1" in ;; aarch64) echo "Enabling armhf arch..." - sudo dpkg --add-architecture armhf + dpkg --add-architecture armhf ;; *) echo "Unknown architecture, skip enable 32-bit arch" -- Gitee From 90ec030f8b75978fd3f3bb2fcbe4412788d6318a Mon Sep 17 00:00:00 2001 From: shenmo Date: Wed, 12 Apr 2023 05:17:32 +0000 Subject: [PATCH 10/10] update debian/changelog. Signed-off-by: shenmo --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 3ed0357..088306a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ spark-store (4.2.5) stable; urgency=medium * 修复：ssinstall在文件不存在时仍然报安装成功 * 修复：删除不再需要的依赖：libc6-dev + * 在aarch64架构安装时也启用32位支持 -- shenmo -- Gitee