mirror of
https://gitee.com/spark-store-project/spark-store
synced 2025-12-15 21:32:05 +08:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 32c74bc5a0 | |||
| ce34fc763f | |||
| 85823fdc23 | |||
| 5f12494b95 | |||
| 8be23ff5f4 | |||
| b060000028 |
5
debian/changelog
vendored
5
debian/changelog
vendored
@@ -1,6 +1,7 @@
|
||||
spark-store (4.3.2.1) UNRELEASED; urgency=medium
|
||||
spark-store (4.3.3) UNRELEASED; urgency=medium
|
||||
|
||||
* 修复 aptss policy / aptss search 需要root的问题
|
||||
* 修复点击更新需要输入密码的问题
|
||||
* 修复安装速度下降的问题
|
||||
|
||||
-- shenmo <shenmo@spark-app.store> Tue, 24 Sep 2024 11:27:08 +0800
|
||||
|
||||
|
||||
2
debian/source/format
vendored
2
debian/source/format
vendored
@@ -1 +1 @@
|
||||
1.0
|
||||
3.0 (native)
|
||||
@@ -52,7 +52,7 @@ for argument in "$@"; do
|
||||
option="source"
|
||||
root=0
|
||||
;;
|
||||
changelog|search|policy)
|
||||
changelog|search|policy|show)
|
||||
root=0
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -123,7 +123,7 @@ DEBPATH=$(realpath "$1")
|
||||
exit "$try_run_ret"
|
||||
fi
|
||||
|
||||
aptss install "$DEBPATH" -yf --reinstall
|
||||
dpkg -i "$DEBPATH" || aptss install "$DEBPATH" -yf
|
||||
|
||||
if [ "$?" = "0" ] && [ "$2" = "--delete-after-install" ]; then
|
||||
if dpkg -s "$package_name" >/dev/null 2>&1; then
|
||||
|
||||
@@ -166,7 +166,7 @@ if [ ! -z "$IS_SHA512SUM_CHECKED" ]; then
|
||||
exit "$try_run_ret"
|
||||
fi
|
||||
|
||||
aptss install "$DEBPATH" -yf --reinstall
|
||||
dpkg -i "$DEBPATH" || aptss install "$DEBPATH" -yf
|
||||
|
||||
unlock_file "$DEBPATH"
|
||||
|
||||
|
||||
@@ -2,7 +2,11 @@
|
||||
# We use sudo twice to avoid ACE bug here
|
||||
# https://gitee.com/amber-ce/amber-ce-bookworm/commit/43e1a1599ede474b37e41aa10c53fd8afc4d35a1
|
||||
|
||||
function zenity() {
|
||||
#!/bin/bash
|
||||
# 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
|
||||
@@ -10,36 +14,33 @@ function zenity() {
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
|
||||
# 检查sudo是否需要密码
|
||||
if sudo sudo -n true 2>/dev/null; then
|
||||
if sudo -n true 2>/dev/null; then
|
||||
echo "sudo 无需密码,继续执行"
|
||||
|
||||
else
|
||||
|
||||
# 循环输入密码直到成功或用户取消
|
||||
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
|
||||
# 循环输入密码直到成功或用户取消
|
||||
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
|
||||
fi
|
||||
|
||||
# 使用sudo命令执行目标程序
|
||||
echo "$PASSWORD" | sudo sudo -S "$@"
|
||||
|
||||
@@ -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" "$@"
|
||||
|
||||
Reference in New Issue
Block a user