Skip to content

Commit fdc7bf2

Browse files
shenmo7192gitee-org
shenmo7192
authored and
gitee-org
committed
!301 4321
Merge pull request !301 from shenmo/dev
2 parents 62642cc + ed3db29 commit fdc7bf2

File tree

12 files changed

+112
-45
lines changed

12 files changed

+112
-45
lines changed

‎.github/workflows/program-builder.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Building Program
2+
run-name: Building ${{ GITHUB.REPOSITORY }}
3+
4+
on:
5+
workflow_dispatch:
6+
push:
7+
tags:
8+
- "*"
9+
10+
jobs:
11+
call:
12+
uses: GXDE-OS/GXDE/.github/workflows/building-deb.yml@master
13+
secrets: inherit

‎debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
spark-store (4.3.2.1) UNRELEASED; urgency=medium
2+
3+
* 修复 aptss policy / aptss search 需要root的问题
4+
5+
-- shenmo <[email protected]> Tue, 24 Sep 2024 11:27:08 +0800
6+
17
spark-store (4.3.2.0) UNRELEASED; urgency=medium
28

39
* 后续更新请从4.3.2.0版本号开始，4.3.2版本仅用于GXDE测试

‎tool/apt-fast/ss-apt-fast

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ for argument in "$@"; do
5252
option="source"
5353
root=0
5454
;;
55-
changelog)
55+
changelog|search|policy)
5656
root=0
5757
;;
5858
esac

‎tool/ssaudit

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ DEBPATH=$(realpath "$1")
123123
exit "$try_run_ret"
124124
fi
125125

126-
127126
aptss install "$DEBPATH" -yf --reinstall
128127

129128
if [ "$?" = "0" ] && [ "$2" = "--delete-after-install" ]; then

‎tool/ssinstall

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ if [ ! -z "$IS_SHA512SUM_CHECKED" ]; then
165165
echo -e "${try_run_output}"
166166
exit "$try_run_ret"
167167
fi
168-
168+
169169
aptss install "$DEBPATH" -yf --reinstall
170170

171171
unlock_file "$DEBPATH"

‎tool/store-helper/pass-auth.sh

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#!/bin/bash
2+
# We use sudo twice to avoid ACE bug here
3+
# https://gitee.com/amber-ce/amber-ce-bookworm/commit/43e1a1599ede474b37e41aa10c53fd8afc4d35a1
4+
5+
function zenity() {
6+
if [[ -e /usr/bin/garma ]]; then
7+
garma "$@"
8+
else
9+
$(command -v zenity) "$@"
10+
fi
11+
}
12+
13+
14+
15+
# 检查sudo是否需要密码
16+
if sudo sudo -n true 2>/dev/null; then
17+
echo "sudo 无需密码，继续执行"
18+
19+
else
20+
21+
# 循环输入密码直到成功或用户取消
22+
while true; do
23+
# 使用zenity弹出密码输入框
24+
PASSWORD=$(zenity --password --title="需要sudo权限" )
25+
26+
# 检查用户是否取消输入
27+
if [ -z "$PASSWORD" ]; then
28+
zenity --error --text="操作已取消"
29+
exit 1
30+
fi
31+
32+
# 尝试使用输入的密码执行sudo命令
33+
echo "$PASSWORD" | sudo sudo -S true 2>/dev/null
34+
35+
# 检查sudo是否成功
36+
if [ $? -eq 0 ]; then
37+
echo "密码正确，继续执行"
38+
break
39+
else
40+
zenity --error --text="密码错误，请重新输入"
41+
fi
42+
done
43+
fi
44+
45+
echo "$PASSWORD" | sudo sudo -S "$@"

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
#!/bin/bash
22
if [ "$(id -u)" != "0" ] ; then
3-
pkexec "$0" "$@"
4-
exit
3+
if [[ IS_ACE_ENV="1" ]];then
4+
/opt/durapps/spark-store/bin/store-helper/pass-auth.sh "$0" "$@"
5+
else
6+
pkexec "$0" "$@"
7+
exit
8+
fi
59
fi
610
trap "rm -f /tmp/spark-store/upgradeStatus.txt" EXIT
711
source /opt/durapps/spark-store/bin/bashimport/transhell.amber

‎translations/spark-store_en.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -481,28 +481,28 @@
481481
<translation type="unfinished"></translation>
482482
</message>
483483
<message>
484-
<location filename="../src/mainwindow-dtk.cpp" line="216"/>
484+
<location filename="../src/mainwindow-dtk.cpp" line="217"/>
485485
<source>Submit App</source>
486486
<translation type="unfinished"></translation>
487487
</message>
488488
<message>
489-
<location filename="../src/mainwindow-dtk.cpp" line="217"/>
489+
<location filename="../src/mainwindow-dtk.cpp" line="218"/>
490490
<source>Submit App with client(Recommanded)</source>
491491
<translation type="unfinished"></translation>
492492
</message>
493493
<message>
494-
<location filename="../src/mainwindow-dtk.cpp" line="218"/>
494+
<location filename="../src/mainwindow-dtk.cpp" line="219"/>
495495
<source>Settings</source>
496496
<translation type="unfinished"></translation>
497497
</message>
498498
<message>
499-
<location filename="../src/mainwindow-dtk.cpp" line="219"/>
499+
<location filename="../src/mainwindow-dtk.cpp" line="220"/>
500500
<source>APP Upgrade and Install Settings</source>
501501
<translation type="unfinished"></translation>
502502
</message>
503503
<message>
504504
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
505-
<location filename="../src/mainwindow-dtk.cpp" line="270"/>
505+
<location filename="../src/mainwindow-dtk.cpp" line="271"/>
506506
<source>Spark Store</source>
507507
<translation type="unfinished"></translation>
508508
</message>
@@ -537,7 +537,7 @@
537537
<translation type="unfinished"></translation>
538538
</message>
539539
<message>
540-
<location filename="../src/mainwindow-dtk.cpp" line="273"/>
540+
<location filename="../src/mainwindow-dtk.cpp" line="274"/>
541541
<source>Show MainWindow</source>
542542
<translation type="unfinished"></translation>
543543
</message>
@@ -658,12 +658,12 @@
658658
<context>
659659
<name>TitleBarMenu</name>
660660
<message>
661-
<location filename="../src/mainwindow-dtk.cpp" line="274"/>
661+
<location filename="../src/mainwindow-dtk.cpp" line="275"/>
662662
<source>About</source>
663663
<translation type="unfinished"></translation>
664664
</message>
665665
<message>
666-
<location filename="../src/mainwindow-dtk.cpp" line="275"/>
666+
<location filename="../src/mainwindow-dtk.cpp" line="276"/>
667667
<source>Exit</source>
668668
<translation type="unfinished"></translation>
669669
</message>

‎translations/spark-store_es.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -481,28 +481,28 @@
481481
<translation>Actualización de app</translation>
482482
</message>
483483
<message>
484-
<location filename="../src/mainwindow-dtk.cpp" line="216"/>
484+
<location filename="../src/mainwindow-dtk.cpp" line="217"/>
485485
<source>Submit App</source>
486486
<translation>Presentación de la aplicación</translation>
487487
</message>
488488
<message>
489-
<location filename="../src/mainwindow-dtk.cpp" line="217"/>
489+
<location filename="../src/mainwindow-dtk.cpp" line="218"/>
490490
<source>Submit App with client(Recommanded)</source>
491491
<translation>Enviar la aplicación al cliente (recomendación)</translation>
492492
</message>
493493
<message>
494-
<location filename="../src/mainwindow-dtk.cpp" line="218"/>
494+
<location filename="../src/mainwindow-dtk.cpp" line="219"/>
495495
<source>Settings</source>
496496
<translation>Configuración</translation>
497497
</message>
498498
<message>
499-
<location filename="../src/mainwindow-dtk.cpp" line="219"/>
499+
<location filename="../src/mainwindow-dtk.cpp" line="220"/>
500500
<source>APP Upgrade and Install Settings</source>
501501
<translation>Actualización e instalación de app</translation>
502502
</message>
503503
<message>
504504
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
505-
<location filename="../src/mainwindow-dtk.cpp" line="270"/>
505+
<location filename="../src/mainwindow-dtk.cpp" line="271"/>
506506
<source>Spark Store</source>
507507
<translation>SPARK Store</translation>
508508
</message>
@@ -537,7 +537,7 @@
537537
<translation>Descargar lista</translation>
538538
</message>
539539
<message>
540-
<location filename="../src/mainwindow-dtk.cpp" line="273"/>
540+
<location filename="../src/mainwindow-dtk.cpp" line="274"/>
541541
<source>Show MainWindow</source>
542542
<translation>Mostrar la ventana principal</translation>
543543
</message>
@@ -658,12 +658,12 @@
658658
<context>
659659
<name>TitleBarMenu</name>
660660
<message>
661-
<location filename="../src/mainwindow-dtk.cpp" line="274"/>
661+
<location filename="../src/mainwindow-dtk.cpp" line="275"/>
662662
<source>About</source>
663663
<translation>Sobre</translation>
664664
</message>
665665
<message>
666-
<location filename="../src/mainwindow-dtk.cpp" line="275"/>
666+
<location filename="../src/mainwindow-dtk.cpp" line="276"/>
667667
<source>Exit</source>
668668
<translation>Exportaciones</translation>
669669
</message>

‎translations/spark-store_fr.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -481,28 +481,28 @@
481481
<translation>Mise à niveau app</translation>
482482
</message>
483483
<message>
484-
<location filename="../src/mainwindow-dtk.cpp" line="216"/>
484+
<location filename="../src/mainwindow-dtk.cpp" line="217"/>
485485
<source>Submit App</source>
486486
<translation>Soumettre une application</translation>
487487
</message>
488488
<message>
489-
<location filename="../src/mainwindow-dtk.cpp" line="217"/>
489+
<location filename="../src/mainwindow-dtk.cpp" line="218"/>
490490
<source>Submit App with client(Recommanded)</source>
491491
<translation>Soumettre une demande au client (recommandé)</translation>
492492
</message>
493493
<message>
494-
<location filename="../src/mainwindow-dtk.cpp" line="218"/>
494+
<location filename="../src/mainwindow-dtk.cpp" line="219"/>
495495
<source>Settings</source>
496496
<translation>Paramètres</translation>
497497
</message>
498498
<message>
499-
<location filename="../src/mainwindow-dtk.cpp" line="219"/>
499+
<location filename="../src/mainwindow-dtk.cpp" line="220"/>
500500
<source>APP Upgrade and Install Settings</source>
501501
<translation>Paramètres de mise à niveau et d&apos;installation de l&apos;app</translation>
502502
</message>
503503
<message>
504504
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
505-
<location filename="../src/mainwindow-dtk.cpp" line="270"/>
505+
<location filename="../src/mainwindow-dtk.cpp" line="271"/>
506506
<source>Spark Store</source>
507507
<translation>Le Spark store</translation>
508508
</message>
@@ -537,7 +537,7 @@
537537
<translation>Télécharger la Liste</translation>
538538
</message>
539539
<message>
540-
<location filename="../src/mainwindow-dtk.cpp" line="273"/>
540+
<location filename="../src/mainwindow-dtk.cpp" line="274"/>
541541
<source>Show MainWindow</source>
542542
<translation>Afficher la fenêtre principale</translation>
543543
</message>
@@ -658,12 +658,12 @@
658658
<context>
659659
<name>TitleBarMenu</name>
660660
<message>
661-
<location filename="../src/mainwindow-dtk.cpp" line="274"/>
661+
<location filename="../src/mainwindow-dtk.cpp" line="275"/>
662662
<source>About</source>
663663
<translation>À propos</translation>
664664
</message>
665665
<message>
666-
<location filename="../src/mainwindow-dtk.cpp" line="275"/>
666+
<location filename="../src/mainwindow-dtk.cpp" line="276"/>
667667
<source>Exit</source>
668668
<translation>Exportations</translation>
669669
</message>

‎translations/spark-store_zh_CN.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -481,28 +481,28 @@
481481
<translation>更新</translation>
482482
</message>
483483
<message>
484-
<location filename="../src/mainwindow-dtk.cpp" line="216"/>
484+
<location filename="../src/mainwindow-dtk.cpp" line="217"/>
485485
<source>Submit App</source>
486486
<translation>投递应用</translation>
487487
</message>
488488
<message>
489-
<location filename="../src/mainwindow-dtk.cpp" line="217"/>
489+
<location filename="../src/mainwindow-dtk.cpp" line="218"/>
490490
<source>Submit App with client(Recommanded)</source>
491491
<translation>使用本地投稿器投递应用（推荐）</translation>
492492
</message>
493493
<message>
494-
<location filename="../src/mainwindow-dtk.cpp" line="218"/>
494+
<location filename="../src/mainwindow-dtk.cpp" line="219"/>
495495
<source>Settings</source>
496496
<translation>设置</translation>
497497
</message>
498498
<message>
499-
<location filename="../src/mainwindow-dtk.cpp" line="219"/>
499+
<location filename="../src/mainwindow-dtk.cpp" line="220"/>
500500
<source>APP Upgrade and Install Settings</source>
501501
<translation>应用更新和安装设置</translation>
502502
</message>
503503
<message>
504504
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
505-
<location filename="../src/mainwindow-dtk.cpp" line="270"/>
505+
<location filename="../src/mainwindow-dtk.cpp" line="271"/>
506506
<source>Spark Store</source>
507507
<translation>星火应用商店</translation>
508508
</message>
@@ -537,7 +537,7 @@
537537
<translation>下载列表</translation>
538538
</message>
539539
<message>
540-
<location filename="../src/mainwindow-dtk.cpp" line="273"/>
540+
<location filename="../src/mainwindow-dtk.cpp" line="274"/>
541541
<source>Show MainWindow</source>
542542
<translation>显示主窗口</translation>
543543
</message>
@@ -658,12 +658,12 @@
658658
<context>
659659
<name>TitleBarMenu</name>
660660
<message>
661-
<location filename="../src/mainwindow-dtk.cpp" line="274"/>
661+
<location filename="../src/mainwindow-dtk.cpp" line="275"/>
662662
<source>About</source>
663663
<translation>关于</translation>
664664
</message>
665665
<message>
666-
<location filename="../src/mainwindow-dtk.cpp" line="275"/>
666+
<location filename="../src/mainwindow-dtk.cpp" line="276"/>
667667
<source>Exit</source>
668668
<translation>退出</translation>
669669
</message>

‎translations/spark-store_zh_TW.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -481,28 +481,28 @@
481481
<translation>軟體更新</translation>
482482
</message>
483483
<message>
484-
<location filename="../src/mainwindow-dtk.cpp" line="216"/>
484+
<location filename="../src/mainwindow-dtk.cpp" line="217"/>
485485
<source>Submit App</source>
486486
<translation>上傳軟體</translation>
487487
</message>
488488
<message>
489-
<location filename="../src/mainwindow-dtk.cpp" line="217"/>
489+
<location filename="../src/mainwindow-dtk.cpp" line="218"/>
490490
<source>Submit App with client(Recommanded)</source>
491491
<translation>從客戶端上傳軟體(推薦的)</translation>
492492
</message>
493493
<message>
494-
<location filename="../src/mainwindow-dtk.cpp" line="218"/>
494+
<location filename="../src/mainwindow-dtk.cpp" line="219"/>
495495
<source>Settings</source>
496496
<translation>設定</translation>
497497
</message>
498498
<message>
499-
<location filename="../src/mainwindow-dtk.cpp" line="219"/>
499+
<location filename="../src/mainwindow-dtk.cpp" line="220"/>
500500
<source>APP Upgrade and Install Settings</source>
501501
<translation>軟體升級 和 安裝設定</translation>
502502
</message>
503503
<message>
504504
<location filename="../src/mainwindow-dtk.cpp" line="171"/>
505-
<location filename="../src/mainwindow-dtk.cpp" line="270"/>
505+
<location filename="../src/mainwindow-dtk.cpp" line="271"/>
506506
<source>Spark Store</source>
507507
<translation>星火应用商店</translation>
508508
</message>
@@ -537,7 +537,7 @@
537537
<translation>下载列表</translation>
538538
</message>
539539
<message>
540-
<location filename="../src/mainwindow-dtk.cpp" line="273"/>
540+
<location filename="../src/mainwindow-dtk.cpp" line="274"/>
541541
<source>Show MainWindow</source>
542542
<translation>显示主窗口</translation>
543543
</message>
@@ -658,12 +658,12 @@
658658
<context>
659659
<name>TitleBarMenu</name>
660660
<message>
661-
<location filename="../src/mainwindow-dtk.cpp" line="274"/>
661+
<location filename="../src/mainwindow-dtk.cpp" line="275"/>
662662
<source>About</source>
663663
<translation>关于</translation>
664664
</message>
665665
<message>
666-
<location filename="../src/mainwindow-dtk.cpp" line="275"/>
666+
<location filename="../src/mainwindow-dtk.cpp" line="276"/>
667667
<source>Exit</source>
668668
<translation>退出</translation>
669669
</message>

0 commit comments

Comments
 (0)