!301 4321

Merge pull request !301 from shenmo/dev

.workflow/dtk-build-release-tag-20220425.yml

@@ -18,28 +18,22 @@ stages:
         name: execute_by_docker
         displayName: 基于镜像的DTK构建
         certificate: ''
-        image: docker.jianmuhub.com/library/debian:buster
+        image: docker.io/debian:buster
         command:
           - sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
           - '# 换源'
           - apt update
           - export DEBIAN_FRONTEND=noninteractive
-          - echo "安装依赖..."
-          - 'apt install libgsettings-qt-dev -y '
-          - 'apt install debhelper git curl fakeroot qtbase5-dev zlib1g-dev qt5-default  -y '
+          - echo "安装git devscripts equivs curl..."
+          - 'apt install git devscripts equivs curl -y '
           - git clone https://gitlink.org.cn/shenmo7192/dtk-old-bundle.git
           - cd dtk-old-bundle
           - apt install ./*.deb -y
           - cd ..
           - rm -rf dtk-old-bundle
           - ''
-          - '#mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes  -y" '
-          - apt build-dep . -y
-          - strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5
-          - uname -a
-          - sed -i 's/dh \$@ --parallel/dh \$@/' debian/rules
-          - '# Gitee的配置太低了'
-          - dpkg-buildpackage  -b -us -uc
+          - 'mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes  -y" '
+          - dpkg-buildpackage -j2 -b -us -uc
           - cd ..
           - ls -all
           - pwd

debian/changelog

@@ -1,9 +1,6 @@
-spark-store (4.3.3.1) UNRELEASED; urgency=medium
+spark-store (4.3.2.1) UNRELEASED; urgency=medium
 
-  * 修复点击更新需要输入密码的问题
-  * 修复安装速度下降的问题
-  * 修复闪退问题
-  * 修复错误地展示已安装
+  * 修复 aptss policy / aptss search 需要root的问题
 
  -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
 

debian/source/format

@@ -1 +1 @@
-3.0 (native)
+1.0

src/pages/appintopage.cpp

@@ -287,10 +287,8 @@ void AppIntoPage::setDownloadWidget(DownloadListWidget *w)
     }
 
     dw = w;
-    connect(w, &DownloadListWidget::downloadFinished, this, [=]() {
-            isDownloading(SparkAPI::getServerUrl() + SparkAPI::getArchDir() + spk.path() + "/" + info["Filename"].toString());
-        },
-            Qt::QueuedConnection);
+    connect(w, &DownloadListWidget::downloadFinished, [=]()
+    { isDownloading(SparkAPI::getServerUrl() + SparkAPI::getArchDir() + spk.path() + "/" + info["Filename"].toString()); });
 }
 
 void AppIntoPage::initUI()
@@ -488,10 +486,7 @@ void AppIntoPage::on_downloadButton_clicked()
             return;
         }
 
-        connect(item, &DownloadItem::finished, this, [=]() {
-                isDownloading(downloadUrl);
-            },
-                Qt::QueuedConnection);
+        connect(item, &DownloadItem::finished, [=]() { isDownloading(downloadUrl); });
 
         item->install(0);
         isDownloading(downloadUrl);
@@ -512,10 +507,7 @@ void AppIntoPage::on_downloadButton_clicked()
         item->reinstall = true;
     }
     ui->downloadButton->setEnabled(false);
-    connect(item, &DownloadItem::finished, this, [=]() {
-        isDownloading(downloadUrl);
-    },
-        Qt::QueuedConnection);
+    connect(item, &DownloadItem::finished, [=]() { isDownloading(downloadUrl); });
 
     isDownloading(downloadUrl);
 }

tool/apt-fast/ss-apt-fast

@@ -52,7 +52,7 @@ for argument in "$@"; do
       option="source"
       root=0
       ;;
-    changelog|search|policy|show)
+    changelog|search|policy)
       root=0
       ;;
   esac

tool/ssaudit

@@ -123,7 +123,7 @@ DEBPATH=$(realpath "$1")
         exit "$try_run_ret"
     fi
 
-    dpkg -i "$DEBPATH" || aptss install "$DEBPATH" -yf
+    aptss install "$DEBPATH" -yf --reinstall
 
     if [ "$?" = "0" ] && [ "$2" = "--delete-after-install" ]; then
         if dpkg -s "$package_name" >/dev/null 2>&1; then

tool/ssinstall

@@ -166,7 +166,7 @@ if [ ! -z "$IS_SHA512SUM_CHECKED" ]; then
         exit "$try_run_ret"
     fi
 
-    dpkg -i "$DEBPATH" || aptss install "$DEBPATH" -yf 
+    aptss install "$DEBPATH" -yf --reinstall
 
 unlock_file "$DEBPATH"
 

tool/store-helper/check-is-installed

@@ -1,2 +1,2 @@
 #!/bin/bash
-dpkg -l | grep "^ii  $1 " > /dev/null
+dpkg -l | grep "^ii" | grep -w "$1" > /dev/null

tool/store-helper/pass-auth.sh

@@ -2,11 +2,7 @@
 # We use sudo twice to avoid ACE bug here 
 # https://gitee.com/amber-ce/amber-ce-bookworm/commit/43e1a1599ede474b37e41aa10c53fd8afc4d35a1
 
-#!/bin/bash
-# We use sudo twice to avoid ACE bug here 
-# https://gitee.com/amber-ce/amber-ce-bookworm/commit/43e1a1599ede474b37e41aa10c53fd8afc4d35a1
-
-function zenity_prompt() {
+function zenity() {
     if [[ -e /usr/bin/garma ]]; then
         garma "$@"
     else
@@ -14,33 +10,36 @@ function zenity_prompt() {
     fi
 }
 
+
+
 # 检查sudo是否需要密码
-if sudo -n true 2>/dev/null; then
+if sudo sudo -n true 2>/dev/null; then
     echo "sudo 无需密码，继续执行"
+    
 else
-    # 循环输入密码直到成功或用户取消
-    while true; do
-        # 使用zenity弹出密码输入框
-        PASSWORD=$(zenity_prompt --password --title="需要sudo权限")
-        
-        # 检查用户是否取消输入
-        if [ -z "$PASSWORD" ]; then
-            zenity_prompt --error --text="操作已取消"
-            exit 1
-        fi
-        
-        # 尝试使用输入的密码执行sudo命令
-        echo "$PASSWORD" | sudo -S -v 2>/dev/null
-        
-        # 检查sudo是否成功
-        if [ $? -eq 0 ]; then
-            echo "密码正确，继续执行"
-            break
-        else
-            zenity_prompt --error --text="密码错误，请重新输入"
-        fi
-    done
+
+# 循环输入密码直到成功或用户取消
+while true; do
+    # 使用zenity弹出密码输入框
+    PASSWORD=$(zenity --password --title="需要sudo权限" )
+    
+    # 检查用户是否取消输入
+    if [ -z "$PASSWORD" ]; then
+        zenity --error --text="操作已取消"
+        exit 1
+    fi
+    
+    # 尝试使用输入的密码执行sudo命令
+    echo "$PASSWORD" | sudo sudo -S true 2>/dev/null
+    
+    # 检查sudo是否成功
+    if [ $? -eq 0 ]; then
+        echo "密码正确，继续执行"
+        break
+    else
+        zenity --error --text="密码错误，请重新输入"
+    fi
+done
 fi
 
-# 使用sudo命令执行目标程序
 echo "$PASSWORD" | sudo sudo -S "$@"

tool/update-upgrade/ss-do-upgrade.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 if [ "$(id -u)" != "0" ] ; then
-    if [ "$IS_ACE_ENV" = "1" ];then
+    if [[ IS_ACE_ENV="1" ]];then
         /opt/durapps/spark-store/bin/store-helper/pass-auth.sh "$0" "$@"
     else
 	   pkexec "$0" "$@"