!301 4321

Merge pull request !301 from shenmo/dev

debian/changelog

@@ -1,6 +1,6 @@
-spark-store (4.3.2.2) 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

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
+function zenity() {
-# We use sudo twice to avoid ACE bug here 
-# https://gitee.com/amber-ce/amber-ce-bookworm/commit/43e1a1599ede474b37e41aa10c53fd8afc4d35a1
-
-function zenity_prompt() {
     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弹出密码输入框
+while true; do
-        PASSWORD=$(zenity_prompt --password --title="需要sudo权限")
+    # 使用zenity弹出密码输入框
-        
+    PASSWORD=$(zenity --password --title="需要sudo权限" )
-        # 检查用户是否取消输入
+    
-        if [ -z "$PASSWORD" ]; then
+    # 检查用户是否取消输入
-            zenity_prompt --error --text="操作已取消"
+    if [ -z "$PASSWORD" ]; then
-            exit 1
+        zenity --error --text="操作已取消"
-        fi
+        exit 1
-        
+    fi
-        # 尝试使用输入的密码执行sudo命令
+    
-        echo "$PASSWORD" | sudo -S -v 2>/dev/null
+    # 尝试使用输入的密码执行sudo命令
-        
+    echo "$PASSWORD" | sudo sudo -S true 2>/dev/null
-        # 检查sudo是否成功
+    
-        if [ $? -eq 0 ]; then
+    # 检查sudo是否成功
-            echo "密码正确，继续执行"
+    if [ $? -eq 0 ]; then
-            break
+        echo "密码正确，继续执行"
-        else
+        break
-            zenity_prompt --error --text="密码错误，请重新输入"
+    else
-        fi
+        zenity --error --text="密码错误，请重新输入"
-    done
+    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" "$@"