diff --git a/.github/workflows/program-builder.yml b/.github/workflows/program-builder.yml
new file mode 100644
index 0000000..664aba2
--- /dev/null
+++ b/.github/workflows/program-builder.yml
@@ -0,0 +1,13 @@
+name: Building Program
+run-name: Building ${{ GITHUB.REPOSITORY }}
+
+on:
+ workflow_dispatch:
+ push:
+ tags:
+ - "*"
+
+jobs:
+ call:
+ uses: GXDE-OS/GXDE/.github/workflows/building-deb.yml@master
+ secrets: inherit
diff --git a/debian/changelog b/debian/changelog
index 1ff90df..db0848b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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
+
spark-store (4.3.2.0) UNRELEASED; urgency=medium
* 后续更新请从4.3.2.0版本号开始，4.3.2版本仅用于GXDE测试
diff --git a/tool/apt-fast/ss-apt-fast b/tool/apt-fast/ss-apt-fast
index c051823..b4de6f4 100755
--- a/tool/apt-fast/ss-apt-fast
+++ b/tool/apt-fast/ss-apt-fast
@@ -52,7 +52,7 @@ for argument in "$@"; do
option="source"
root=0
;;
- changelog)
+ changelog|search|policy)
root=0
;;
esac
diff --git a/tool/ssaudit b/tool/ssaudit
index e486023..634cb7b 100755
--- a/tool/ssaudit
+++ b/tool/ssaudit
@@ -123,7 +123,6 @@ DEBPATH=$(realpath "$1")
exit "$try_run_ret"
fi
-
aptss install "$DEBPATH" -yf --reinstall
if [ "$?" = "0" ] && [ "$2" = "--delete-after-install" ]; then
diff --git a/tool/ssinstall b/tool/ssinstall
index 42d2c20..2f1fcb3 100755
--- a/tool/ssinstall
+++ b/tool/ssinstall
@@ -165,7 +165,7 @@ if [ ! -z "$IS_SHA512SUM_CHECKED" ]; then
echo -e "${try_run_output}"
exit "$try_run_ret"
fi
-
+
aptss install "$DEBPATH" -yf --reinstall
unlock_file "$DEBPATH"
diff --git a/tool/store-helper/pass-auth.sh b/tool/store-helper/pass-auth.sh
new file mode 100755
index 0000000..f858cea
--- /dev/null
+++ b/tool/store-helper/pass-auth.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+# We use sudo twice to avoid ACE bug here
+# https://gitee.com/amber-ce/amber-ce-bookworm/commit/43e1a1599ede474b37e41aa10c53fd8afc4d35a1
+
+function zenity() {
+ if [[ -e /usr/bin/garma ]]; then
+ garma "$@"
+ else
+ $(command -v zenity) "$@"
+ fi
+}
+
+
+
+# 检查sudo是否需要密码
+if sudo 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
+fi
+
+echo "$PASSWORD" | sudo sudo -S "$@"
diff --git a/tool/update-upgrade/ss-do-upgrade.sh b/tool/update-upgrade/ss-do-upgrade.sh
index 2b72ba4..191198d 100755
--- a/tool/update-upgrade/ss-do-upgrade.sh
+++ b/tool/update-upgrade/ss-do-upgrade.sh
@@ -1,7 +1,11 @@
#!/bin/bash
if [ "$(id -u)" != "0" ] ; then
- pkexec "$0" "$@"
- exit
+ if [[ IS_ACE_ENV="1" ]];then
+ /opt/durapps/spark-store/bin/store-helper/pass-auth.sh "$0" "$@"
+ else
+ pkexec "$0" "$@"
+ exit
+ fi
fi
trap "rm -f /tmp/spark-store/upgradeStatus.txt" EXIT
source /opt/durapps/spark-store/bin/bashimport/transhell.amber
diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts
index 1f16de4..1ffe140 100644
--- a/translations/spark-store_en.ts
+++ b/translations/spark-store_en.ts
@@ -481,28 +481,28 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="216"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="217"/>
<source>Submit App</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="217"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="218"/>
<source>Submit App with client(Recommanded)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="218"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="219"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="219"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="220"/>
<source>APP Upgrade and Install Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
- <location filename="../src/mainwindow-dtk.cpp" line="270"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="271"/>
<source>Spark Store</source>
<translation type="unfinished"></translation>
</message>
@@ -537,7 +537,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="273"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="274"/>
<source>Show MainWindow</source>
<translation type="unfinished"></translation>
</message>
@@ -658,12 +658,12 @@
<context>
<name>TitleBarMenu</name>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="274"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="275"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="275"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="276"/>
<source>Exit</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/spark-store_es.ts b/translations/spark-store_es.ts
index bd55a84..8e18552 100644
--- a/translations/spark-store_es.ts
+++ b/translations/spark-store_es.ts
@@ -481,28 +481,28 @@
<translation>Actualización de app</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="216"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="217"/>
<source>Submit App</source>
<translation>Presentación de la aplicación</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="217"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="218"/>
<source>Submit App with client(Recommanded)</source>
<translation>Enviar la aplicación al cliente (recomendación)</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="218"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="219"/>
<source>Settings</source>
<translation>Configuración</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="219"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="220"/>
<source>APP Upgrade and Install Settings</source>
<translation>Actualización e instalación de app</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
- <location filename="../src/mainwindow-dtk.cpp" line="270"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="271"/>
<source>Spark Store</source>
<translation>SPARK Store</translation>
</message>
@@ -537,7 +537,7 @@
<translation>Descargar lista</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="273"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="274"/>
<source>Show MainWindow</source>
<translation>Mostrar la ventana principal</translation>
</message>
@@ -658,12 +658,12 @@
<context>
<name>TitleBarMenu</name>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="274"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="275"/>
<source>About</source>
<translation>Sobre</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="275"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="276"/>
<source>Exit</source>
<translation>Exportaciones</translation>
</message>
diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts
index 35e9239..fb30b54 100644
--- a/translations/spark-store_fr.ts
+++ b/translations/spark-store_fr.ts
@@ -481,28 +481,28 @@
<translation>Mise à niveau app</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="216"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="217"/>
<source>Submit App</source>
<translation>Soumettre une application</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="217"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="218"/>
<source>Submit App with client(Recommanded)</source>
<translation>Soumettre une demande au client (recommandé)</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="218"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="219"/>
<source>Settings</source>
<translation>Paramètres</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="219"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="220"/>
<source>APP Upgrade and Install Settings</source>
<translation>Paramètres de mise à niveau et d'installation de l'app</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
- <location filename="../src/mainwindow-dtk.cpp" line="270"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="271"/>
<source>Spark Store</source>
<translation>Le Spark store</translation>
</message>
@@ -537,7 +537,7 @@
<translation>Télécharger la Liste</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="273"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="274"/>
<source>Show MainWindow</source>
<translation>Afficher la fenêtre principale</translation>
</message>
@@ -658,12 +658,12 @@
<context>
<name>TitleBarMenu</name>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="274"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="275"/>
<source>About</source>
<translation>À propos</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="275"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="276"/>
<source>Exit</source>
<translation>Exportations</translation>
</message>
diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts
index f295e7b..2ff43eb 100644
--- a/translations/spark-store_zh_CN.ts
+++ b/translations/spark-store_zh_CN.ts
@@ -481,28 +481,28 @@
<translation>更新</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="216"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="217"/>
<source>Submit App</source>
<translation>投递应用</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="217"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="218"/>
<source>Submit App with client(Recommanded)</source>
<translation>使用本地投稿器投递应用（推荐）</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="218"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="219"/>
<source>Settings</source>
<translation>设置</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="219"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="220"/>
<source>APP Upgrade and Install Settings</source>
<translation>应用更新和安装设置</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
- <location filename="../src/mainwindow-dtk.cpp" line="270"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="271"/>
<source>Spark Store</source>
<translation>星火应用商店</translation>
</message>
@@ -537,7 +537,7 @@
<translation>下载列表</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="273"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="274"/>
<source>Show MainWindow</source>
<translation>显示主窗口</translation>
</message>
@@ -658,12 +658,12 @@
<context>
<name>TitleBarMenu</name>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="274"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="275"/>
<source>About</source>
<translation>关于</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="275"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="276"/>
<source>Exit</source>
<translation>退出</translation>
</message>
diff --git a/translations/spark-store_zh_TW.ts b/translations/spark-store_zh_TW.ts
index 0e0ea9b..3a2a5ea 100644
--- a/translations/spark-store_zh_TW.ts
+++ b/translations/spark-store_zh_TW.ts
@@ -481,28 +481,28 @@
<translation>軟體更新</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="216"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="217"/>
<source>Submit App</source>
<translation>上傳軟體</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="217"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="218"/>
<source>Submit App with client(Recommanded)</source>
<translation>從客戶端上傳軟體(推薦的)</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="218"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="219"/>
<source>Settings</source>
<translation>設定</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="219"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="220"/>
<source>APP Upgrade and Install Settings</source>
<translation>軟體升級 和 安裝設定</translation>
</message>
<message>
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
- <location filename="../src/mainwindow-dtk.cpp" line="270"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="271"/>
<source>Spark Store</source>
<translation>星火应用商店</translation>
</message>
@@ -537,7 +537,7 @@
<translation>下载列表</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="273"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="274"/>
<source>Show MainWindow</source>
<translation>显示主窗口</translation>
</message>
@@ -658,12 +658,12 @@
<context>
<name>TitleBarMenu</name>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="274"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="275"/>
<source>About</source>
<translation>关于</translation>
</message>
<message>
- <location filename="../src/mainwindow-dtk.cpp" line="275"/>
+ <location filename="../src/mainwindow-dtk.cpp" line="276"/>
<source>Exit</source>
<translation>退出</translation>
</message>