From b1cb765b6e63937a9845b52f1db84d0a7a87cb4b Mon Sep 17 00:00:00 2001 From: shenmo Date: Sat, 6 Aug 2022 03:13:57 +0000 Subject: [PATCH] =?UTF-8?q?!66=20=20=20*=20=E5=B1=8F=E8=94=BD=E4=BA=86ssin?= =?UTF-8?q?stall=E4=B9=8B=E5=A4=96=E7=9A=84=E5=AE=89=E8=A3=85=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=20=20*=20=E5=B1=8F=E8=94=BD=E4=BA=86ssinstall?= =?UTF-8?q?=E4=B9=8B=E5=A4=96=E7=9A=84=E5=AE=89=E8=A3=85=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=20*=20=E8=B0=83=E6=95=B4=E4=BA=86=E6=8A=A5=E9=94=99=E6=A1=86?= =?UTF-8?q?=E7=9A=84=E5=BD=A2=E5=BC=8F=20*=20=E4=BF=AE=E5=A4=8Dpkexec?= =?UTF-8?q?=E4=B8=8Bssinstall=E4=B8=8D=E5=A4=84=E7=90=86=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 4 +++- src/downloadlist.cpp | 25 +++++++++++++------------ src/main.cpp | 4 ++-- tool/ssinstall | 12 ++++++------ 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8d7abc1..fc88eff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,9 @@ spark-store (3.1.4) stable; urgency=medium * 发布正式版，同步到官网 * 修复安装时使用wget的问题 * 合并3.1.3-1和3.1.3-2的更改 - + * 屏蔽了ssinstall之外的安装方式 + * 调整了报错框的形式 + * 修复pkexec下ssinstall不处理依赖 -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 diff --git a/src/downloadlist.cpp b/src/downloadlist.cpp index 548b4dc..799a9ce 100644 --- a/src/downloadlist.cpp +++ b/src/downloadlist.cpp @@ -45,18 +45,18 @@ downloadlist::downloadlist(QWidget *parent) : menu_install->addAction(action_dpkg); } - QFile deepin("/usr/bin/deepin-deb-installer"); - deepin.open(QIODevice::ReadOnly); - if(deepin.isOpen()) - { - menu_install->addAction(action_deepin); - } - QFile gdebi("/usr/bin/gdebi"); - gdebi.open(QIODevice::ReadOnly); - if(gdebi.isOpen()) - { - menu_install->addAction(action_gdebi); - } +// QFile deepin("/usr/bin/deepin-deb-installer"); +// deepin.open(QIODevice::ReadOnly); +// if(deepin.isOpen()) +// { +// menu_install->addAction(action_deepin); +// } +// QFile gdebi("/usr/bin/gdebi"); +// gdebi.open(QIODevice::ReadOnly); +// if(gdebi.isOpen()) +// { +// 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); diff --git a/src/main.cpp b/src/main.cpp index 64f4de1..12a6f4c 100644 --- a/src/main.cpp +++ b/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")); 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")); a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store"); a.setApplicationDescription( QObject::tr( diff --git a/tool/ssinstall b/tool/ssinstall index 258c8c4..e57a6c9 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -52,15 +52,15 @@ if [ "$(id -u)" != "0" ];then 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 @@ -76,13 +76,13 @@ else 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