diff --git a/README.md b/README.md index 046af4432957ec8ef6749b04989f9d8fe7626f7a..8fa94758aabf035cebc7277d485645ff291ac083 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 diff --git a/README.zh.md b/README.zh.md index 18b909928ca9beecb0ab5e9d7442f84683072341..0ee4bc378547af31f2c520e6344548bfbf434a17 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) --- #### 编译安装 diff --git a/debian/changelog b/debian/changelog index c13e49469cd5aec229da9841856353ee2a7a7a6c..088306ad67bc9cfd8c1ae481c54233e5d495e7bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +spark-store (4.2.5) stable; urgency=medium + * 修复：ssinstall在文件不存在时仍然报安装成功 + * 修复：删除不再需要的依赖：libc6-dev + * 在aarch64架构安装时也启用32位支持 + + -- shenmo + spark-store (4.2.4) stable; urgency=medium * 修复：ssinstall校验失败的时候仍然提示安装成功 * 新增：ssinstall可以自动刷新ssupdate以防止仓库更新中导致的安装校验失败 diff --git a/debian/control b/debian/control index 302f96962dfa8e3490dba84b93d7dc96c1d69c22..2e62d79d386b9b4b01f36249701bcf5335254e3c 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 diff --git a/debian/spark-store.postinst b/debian/spark-store.postinst index 5f1009ad3514bc02be350ab06924c6c6cdf52289..ad43268870e8e929d6959b6a721725d014819a4a 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..." + dpkg --add-architecture armhf + ;; *) - echo "Not amd64, skip enable i386 arch" + echo "Unknown architecture, skip enable 32-bit arch" ;; esac diff --git a/src/pages/settingspage.cpp b/src/pages/settingspage.cpp index 80127720df49eca4eecebe0ecc133772c4a4817b..a0bf53711d39060dc98513d99005ddbc8630ef5d 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) // 更新失败不换服务器配置 { diff --git a/src/pages/settingspage.ui b/src/pages/settingspage.ui index 6a76ab733470d6c08ed4cf8b9489ca613dc04f9d..1d93ca8817f6d060f47d3f81be6f1607012301b5 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/tool/ssinstall b/tool/ssinstall index 94fdcc63056a141478d97a8c29b1af64d1070dc2..25bf508fd7709b3a81f7d7502850ea1bb7274f86 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 diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts index 0bc11b66ad9fbf25ee35db75b83d9a49c151f290..fcfd185bc687407a10b7d0ec49424dd95da99a69 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 9d51d6bf9ef379590c08d0a885ea74a6b7253668..90ab6497daa6342a706dbdad7736bdece12a1e0a 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 405056f5bc011175076f2d2573543e3f20c0c6d1..93961547324304f534eef1be8ed976bfa407ab4c 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 0d7f454de87977e3b7030ed82bf11c69b911c4aa..e96533bb864a612b30c158299ebf01c21086cf01 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 + 设置后立即生效