* 修复：ssinstall校验失败的时候仍然提示安装成功

* 新增：ssinstall可以自动刷新ssupdate以防止仓库更新中导致的安装校验失败

debian/changelog

@@ -1,3 +1,9 @@
+spark-store (4.2.3.4~test1) stable; urgency=medium
+  * 修复：ssinstall校验失败的时候仍然提示安装成功
+  * 新增：ssinstall可以自动刷新ssupdate以防止仓库更新中导致的安装校验失败
+
+ -- shenmo <shenmo@spark-app.store> 
+
 spark-store (4.2.3.3) stable; urgency=medium
   * aptss 不再使用bwrap，去除依赖，支持容器中启动
   * aptss 支持非root模式启动

tool/ssinstall

@@ -38,6 +38,40 @@ function zenity()
 
     sudo -u $user  DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus zenity "$@"
 }
+
+function hash_check()
+{
+if [ ! -e "/var/lib/aptss/lists/d.spark-app.store_${STORE_URL}_Packages" ] && [ ! -e "/var/lib/aptss/lists/d.store.deepinos.org.cn_${STORE_URL}_Packages" ] && [ ! -e "/var/lib/aptss/lists/mirrors.sdu.edu.cn_spark-store-repository_${STORE_URL}_Packages" ];then
+echo "接收星火仓库软件信息中..."
+aptss ssupdate
+fi
+
+### 选择包信息位置
+
+if [ -e "/var/lib/aptss/lists/d.spark-app.store_${STORE_URL}_Packages" ];then
+PACKAGES_DATA_PATH="/var/lib/aptss/lists/d.spark-app.store_${STORE_URL}_Packages"
+echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH，是星火域名单目录仓库配置"
+elif [ -e "/var/lib/aptss/lists/d.store.deepinos.org.cn_${STORE_URL}_Packages" ];then
+PACKAGES_DATA_PATH="/var/lib/aptss/lists/d.store.deepinos.org.cn_${STORE_URL}_Packages"
+echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH，是星火域名单目录仓库配置"
+else
+PACKAGES_DATA_PATH="/var/lib/aptss/lists/mirrors.sdu.edu.cn_spark-store-repository_${STORE_URL}_Packages"
+echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH，是SDU镜像仓库配置"
+fi
+
+
+
+echo "正在计算hash并与星火仓库匹配..."
+
+DEB_MD5SUM=`md5sum "$1" | cut -c -32`
+
+IS_MD5SUM_CHECKD=`cat $PACKAGES_DATA_PATH | grep $DEB_MD5SUM`
+
+
+}
+
+##########################################################################
+
 #################检测文件是否存在
 if [ $# -eq 0 ];then
 echo "没有接收到参数，退出"
@@ -62,32 +96,15 @@ fi
 
 DEBPATH=`realpath $1`
 
-if [ ! -e "/var/lib/aptss/lists/d.spark-app.store_${STORE_URL}_Packages" ] && [ ! -e "/var/lib/aptss/lists/d.store.deepinos.org.cn_${STORE_URL}_Packages" ] && [ ! -e "/var/lib/aptss/lists/mirrors.sdu.edu.cn_spark-store-repository_${STORE_URL}_Packages" ];then
+hash_check "$DEBPATH"
-echo "接收星火仓库软件信息中..."
+
-aptss update
+if [ -z "$IS_MD5SUM_CHECKD" ];then
+echo "尝试更新仓库信息重新校验"
+aptss ssupdate
+hash_check "$DEBPATH"
 fi
 
-### 选择包信息位置
+if [  ! -z "$IS_MD5SUM_CHECKD" ];then
-
-if [ -e "/var/lib/aptss/lists/d.spark-app.store_${STORE_URL}_Packages" ];then
-PACKAGES_DATA_PATH="/var/lib/aptss/lists/d.spark-app.store_${STORE_URL}_Packages"
-echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH，是星火域名单目录仓库配置"
-elif [ -e "/var/lib/aptss/lists/d.store.deepinos.org.cn_${STORE_URL}_Packages" ];then
-PACKAGES_DATA_PATH="/var/lib/aptss/lists/d.store.deepinos.org.cn_${STORE_URL}_Packages"
-echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH，是星火域名单目录仓库配置"
-else
-PACKAGES_DATA_PATH="/var/lib/aptss/lists/mirrors.sdu.edu.cn_spark-store-repository_${STORE_URL}_Packages"
-echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH，是SDU镜像仓库配置"
-fi
-
-
-
-echo "正在计算hash并与星火仓库匹配..."
-
-DEB_MD5SUM=`md5sum "$DEBPATH" | cut -c -32`
-
-IS_MD5SUM_CHECKD=`cat $PACKAGES_DATA_PATH | grep $DEB_MD5SUM`
-if [ ! -z "$IS_MD5SUM_CHECKD" ];then
 
 echo "校验成功，开始安装"
 echo  ----------------------------------------------------------------------------------
@@ -111,7 +128,6 @@ rm "$DEBPATH"
 echo "${TRANSHELL_CONTENT_DEB_IS_DELETED}"
 else
 echo "${TRANSHELL_CONTENT_WILL_NOT_DELETE_DEB}"
-echo "OMG-IT-GOES-WRONG"
 fi
 
 else
@@ -120,5 +136,6 @@ else
 zenity --info --icon-name=spark-store --height 270 --width 500 --text "${TRANSHELL_CONTENT_HASH_CHECK_FAILED}"
 
 echo -e ${TRANSHELL_CONTENT_HASH_CHECK_FAILED}
+echo "OMG-IT-GOES-WRONG"
 
 fi