Compare commits

..

9 Commits

Author SHA1 Message Date
32c74bc5a0 fix: can not install depends 2024-11-05 18:26:21 +08:00
ce34fc763f fix: 安装速度降低 2024-11-05 15:24:53 +08:00
85823fdc23 update tool/apt-fast/ss-apt-fast.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-10-29 12:08:59 +00:00
5f12494b95 update debian/source/format.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2024-10-29 09:15:26 +00:00
8be23ff5f4 bumpversion 2024-10-29 17:10:04 +08:00
b060000028 fix: Update require password 2024-10-29 17:09:05 +08:00
ed3db29806 add: GXDE Builder 2024-10-28 22:04:40 +08:00
81ab122d6b fix: now we don't need root to policy/search 2024-10-28 21:59:25 +08:00
bab1b1cb0a fix: In ACE you can't use updater 2024-10-25 13:10:25 +08:00
13 changed files with 116 additions and 46 deletions

13
.github/workflows/program-builder.yml vendored Normal file
View File

@@ -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

7
debian/changelog vendored
View File

@@ -1,3 +1,10 @@
spark-store (4.3.3) UNRELEASED; urgency=medium
* 修复点击更新需要输入密码的问题
* 修复安装速度下降的问题
-- 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测试

View File

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

View File

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

View File

@@ -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

View File

@@ -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"

46
tool/store-helper/pass-auth.sh Executable file
View File

@@ -0,0 +1,46 @@
#!/bin/bash
# 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() {
if [[ -e /usr/bin/garma ]]; then
garma "$@"
else
$(command -v zenity) "$@"
fi
}
# 检查sudo是否需要密码
if 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
fi
# 使用sudo命令执行目标程序
echo "$PASSWORD" | sudo sudo -S "$@"

View File

@@ -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

View File

@@ -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>

View File

@@ -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>

View File

@@ -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&apos;installation de l&apos;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>

View File

@@ -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>

View File

@@ -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>