!211 4.2.5

Merge pull request !211 from shenmo/dev

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

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)
 
 ---
 #### 编译安装

debian/changelog

@@ -1,3 +1,10 @@
+spark-store (4.2.5) stable; urgency=medium
+  * 修复：ssinstall在文件不存在时仍然报安装成功
+  * 修复：删除不再需要的依赖：libc6-dev
+  * 在aarch64架构安装时也启用32位支持
+  
+ -- shenmo <shenmo@spark-app.store> 
+
 spark-store (4.2.4) stable; urgency=medium
   * 修复：ssinstall校验失败的时候仍然提示安装成功
   * 新增：ssinstall可以自动刷新ssupdate以防止仓库更新中导致的安装校验失败

debian/control

@@ -42,7 +42,6 @@ Depends:${shlibs:Depends}, ${misc:Depends},
  aria2,
  gcc,
  zenity,
- libc6-dev,
  policykit-1,
  libnotify-bin
 Description: Spark Store

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
 

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) // 更新失败不换服务器配置
         {

src/pages/settingspage.ui

@@ -140,7 +140,7 @@
                    </size>
                   </property>
                   <property name="text">
-                   <string>Take effect when restart</string>
+                   <string>Take effect immediately</string>
                   </property>
                  </widget>
                 </item>

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
 

translations/spark-store_en.ts

@@ -565,7 +565,7 @@
     </message>
     <message>
         <location filename="../src/pages/settingspage.ui" line="143"/>
-        <source>Take effect when restart</source>
+        <source>Take effect immediately</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

translations/spark-store_fr.ts

@@ -565,7 +565,7 @@
     </message>
     <message>
         <location filename="../src/pages/settingspage.ui" line="143"/>
-        <source>Take effect when restart</source>
+        <source>Take effect immediately</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

translations/spark-store_zh_CN.ts

@@ -565,8 +565,8 @@
     </message>
     <message>
         <location filename="../src/pages/settingspage.ui" line="143"/>
-        <source>Take effect when restart</source>
-        <translation>重启商店后生效</translation>
+        <source>Take effect immediately</source>
+        <translation>设置后立即生效</translation>
     </message>
     <message>
         <location filename="../src/pages/settingspage.ui" line="185"/>

translations/spark-store_zh_TW.ts

@@ -565,8 +565,8 @@
     </message>
     <message>
         <location filename="../src/pages/settingspage.ui" line="143"/>
-        <source>Take effect when restart</source>
-        <translation>重启商店后生效</translation>
+        <source>Take effect immediately</source>
+        <translation>设置后立即生效</translation>
     </message>
     <message>
         <location filename="../src/pages/settingspage.ui" line="185"/>