!70 修复：ssinstall在没有安装apt-fast的情况下首次安装需要依赖的软件时安装失败

* 	修改：     debian/changelog
* 修复：ssinstall在没有安装apt-fast的情况下首次安装需要依赖的软件时安装失败

debian/changelog

@@ -1,4 +1,20 @@
+spark-store (3.1.4-1) stable; urgency=medium
 
+  * 安装脚本和检测更新脚本检查网络时间超时时间延长至5s  
+  * 修复：ssinstall在没有安装apt-fast的情况下首次安装需要依赖的软件时安装失败 
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.1.4) stable; urgency=medium
+
+  * 发布正式版，同步到官网
+  * 修复安装时使用wget的问题
+  * 合并3.1.3-1和3.1.3-2的更改
+  * 屏蔽了ssinstall之外的安装方式
+  * 调整了报错框的形式
+  * 修复pkexec下ssinstall不处理依赖
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
 spark-store (3.1.3-2) stable; urgency=medium
 

debian/spark-store.postinst

@@ -16,7 +16,7 @@ case "$1" in
 
 
 		# Download and install key
-		wget -O /tmp/spark-store-install/spark-store.asc https://d.store.deepinos.org.cn/dcs-repo.gpg-key.asc 
+		curl --progress-bar -o /tmp/spark-store-install/spark-store.asc https://d.store.deepinos.org.cn/dcs-repo.gpg-key.asc 
 		gpg --dearmor /tmp/spark-store-install/spark-store.asc 
 		cp -f /tmp/spark-store-install/spark-store.asc.gpg /etc/apt/trusted.gpg.d/spark-store.gpg
 

debian/spark-store.preinst

@@ -3,7 +3,7 @@
 function network-check()
 {
     #超时时间
-    local timeout=1
+    local timeout=5
 
     #目标网站
     local target=www.baidu.com

src/downloadlist.cpp

@@ -45,18 +45,18 @@ downloadlist::downloadlist(QWidget *parent) :
         menu_install->addAction(action_dpkg);
     }
 
-    QFile deepin("/usr/bin/deepin-deb-installer");
+//    QFile deepin("/usr/bin/deepin-deb-installer");
-    deepin.open(QIODevice::ReadOnly);
+//    deepin.open(QIODevice::ReadOnly);
-    if(deepin.isOpen())
+//    if(deepin.isOpen())
-    {
+//    {
-        menu_install->addAction(action_deepin);
+//        menu_install->addAction(action_deepin);
-    }
+//    }
-    QFile gdebi("/usr/bin/gdebi");
+//    QFile gdebi("/usr/bin/gdebi");
-    gdebi.open(QIODevice::ReadOnly);
+//    gdebi.open(QIODevice::ReadOnly);
-    if(gdebi.isOpen())
+//    if(gdebi.isOpen())
-    {
+//    {
-        menu_install->addAction(action_gdebi);
+//        menu_install->addAction(action_gdebi);
-    }
+//    }
     
 }
 
@@ -219,6 +219,7 @@ void downloadlist::on_pushButton_3_clicked()
 {
     textbrowser->setLineWidth(0);
     textbrowser->setText(out);
+    textbrowser->setMinimumHeight(500);
 
     output_w->setMinimumHeight(600);
     output_w->setAttribute(Qt::WA_TranslucentBackground);

src/main.cpp

@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
      DAboutDialog dialog;
       a.setAboutDialog(&dialog);
       dialog.setLicense(QObject::tr("We publish this program under GPL V3"));
-      dialog.setVersion(DApplication::buildVersion("Version 3.1.3-2"));
+      dialog.setVersion(DApplication::buildVersion("Version 3.1.4-1"));
       dialog.setProductIcon(QIcon::fromTheme("spark-store"));  // 设置Logo
       dialog.setProductName(QLabel::tr("Spark Store"));
       dialog.setDescription(
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
     a.setOrganizationName("spark-union");
     a.setOrganizationDomain("https://www.deepinos.org/");
     a.setApplicationName("Spark Store");    //不需要翻译，否则 ~/.local/share/ 下文件夹名称也被翻译为中文
-    a.setApplicationVersion(DApplication::buildVersion("3.1.3-2"));
+    a.setApplicationVersion(DApplication::buildVersion("3.1.4-1"));
     a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
     a.setApplicationDescription(
                 QObject::tr(

tool/ss-apt-fast

@@ -3,7 +3,7 @@
 
 
 
-if  [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "download" ] ; then
+if  [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] || [ "$1" = "download" ] ; then
 
 ###刷新apt-fast配置
 mkdir -p /tmp/ss-apt-fast-conf/sources.list.d
@@ -18,7 +18,7 @@ chmod -R 755 /tmp/ss-apt-fast-conf
 DEPEND=`which  apt-fast`
 if [ "$DEPEND" = "" ] ; then 
 echo "未安装依赖：apt-fast 开始安装"
-sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y
+sudo ss-apt-fast ssupdate && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y
 fi
 ###执行安装
 bwrap --dev-bind / / \

tool/ssinstall

@@ -47,20 +47,25 @@ isuos=`cat /etc/os-release | grep UnionTech`
 if [ "$(id -u)" != "0" ];then
 #############################无root权限时
 
+IS_INSTALLED=`which apt-fast`
+if [ "$IS_INSTALLED" = "" ] ; then 
+echo "未安装依赖：apt-fast 开始安装"
+echo "$upass" | sudo -S /usr/local/bin/ss-apt-fast ssupdate && echo "$upass" | sudo -S bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y
 
+fi
 
 if [ "$DEPEND" != "" ]  && [ "$isuos" != "" ]; then
 echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast"
 echo ----------------------------------------------------------------------------------
-echo "$upass" | sudo -S dpkg -i $1 || sudo ss-apt-fast ssupdate && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install -yf
+echo "$upass" | sudo -S dpkg -i $1 || sudo /usr/local/bin/ss-apt-fast ssupdate && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install -yf
 
 
 fi
 
 if  [ "$DEPEND" != "" ]  && [ "$isuos" = "" ]; then
-echo "检测到apt-fast，使用ss-apt-fast进行多线程下载加速"
+echo "检测到apt-fast，使用/usr/local/bin/ss-apt-fast进行多线程下载加速"
 echo ----------------------------------------------------------------------------------
-echo "$upass" | sudo -S dpkg -i $1 || sudo ss-apt-fast ssupdate && sudo ss-apt-fast install -yf 
+echo "$upass" | sudo -S dpkg -i $1 || sudo /usr/local/bin/ss-apt-fast ssupdate && sudo /usr/local/bin/ss-apt-fast install -yf 
 fi
 
 
@@ -70,19 +75,22 @@ fi
 else
 ###########################有root权限时
 
-
+IS_INSTALLED=`which apt-fast`
-
+if [ "$IS_INSTALLED" = "" ] ; then 
+echo "未安装依赖：apt-fast 开始安装"
+/usr/local/bin/ss-apt-fast ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y
+fi
 
 if [ "$DEPEND" != "" ]  && [ "$isuos" != "" ]; then
 echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast"
 echo ----------------------------------------------------------------------------------
-dpkg -i $1 || ss-apt-fast ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install -yf
+dpkg -i $1 || /usr/local/bin/ss-apt-fast ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install -yf
 fi
 
 if  [ "$DEPEND" != "" ]  && [ "$isuos" = "" ]; then
-echo "检测到apt-fast，使用ss-apt-fast进行多线程下载加速"
+echo "检测到apt-fast，使用/usr/local/bin/ss-apt-fast进行多线程下载加速"
 echo ----------------------------------------------------------------------------------
-dpkg -i $1 || ss-apt-fast ssupdate && ss-apt-fast install -yf 
+dpkg -i $1 || /usr/local/bin/ss-apt-fast ssupdate && /usr/local/bin/ss-apt-fast install -yf 
 fi
 
 

tool/update-upgrade/ss-update-notify-placer.sh

@@ -9,7 +9,7 @@ LANG=en.US
 function network()
 {
     #超时时间
-    local timeout=1
+    local timeout=5
 
     #目标网站
     local target=www.baidu.com