mirror of
https://gitee.com/spark-store-project/spark-store
synced 2025-12-15 21:32:05 +08:00
Compare commits
54 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| aff593eba8 | |||
| 8e3787ab07 | |||
| f7d07e0bf9 | |||
| 9e4df5c5c2 | |||
| af89e64478 | |||
| 971a5dcc63 | |||
| a252e7b724 | |||
| d3987a20ec | |||
| 932e754b88 | |||
| 72a771b0f1 | |||
| b75fbe5674 | |||
| 6617522a7c | |||
| 1733d9853d | |||
| 55c6c13e50 | |||
| 9c2f326268 | |||
| b1a6f79961 | |||
| 1561d511d1 | |||
| 2d2b431df7 | |||
| c87272b463 | |||
| da632d41e7 | |||
| 96b0f0f2be | |||
| 8a7d09b716 | |||
| fcdcd84462 | |||
| 8f63b58062 | |||
| 2c8d38a0da | |||
| 807777e3dc | |||
| 86a9e66e29 | |||
| 15938d0da4 | |||
| 1331c369ad | |||
| d5182c760b | |||
| f9dc1cd09d | |||
| 230c860d91 | |||
| 69f2d6e626 | |||
| 6b560492e8 | |||
| 8886016357 | |||
| 9a74368ef5 | |||
| cf5e1cae76 | |||
| 6d23aaa07c | |||
| 3740b551ef | |||
| 4c7d50d117 | |||
| 6318b5f51d | |||
| 2f94e78c32 | |||
| fecda52294 | |||
| 8cefdbaca0 | |||
| 0da714b35a | |||
| 379c5a857d | |||
| 3b349d43ad | |||
| 6f23d07929 | |||
| b73d97d65d | |||
| 0e351a667a | |||
| e8612f304a | |||
| 57bbc9536a | |||
| 9f7b46b600 | |||
| cdb4fc05a1 |
39
.workflow/dtk-build-commit-20220425.yml
Normal file
39
.workflow/dtk-build-commit-20220425.yml
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
version: '1.0'
|
||||||
|
name: dtk-build-commit-20220425
|
||||||
|
displayName: dtk-build-commit
|
||||||
|
triggers:
|
||||||
|
trigger: auto
|
||||||
|
pr:
|
||||||
|
branches:
|
||||||
|
prefix:
|
||||||
|
- ''
|
||||||
|
stages:
|
||||||
|
- name: stage-4e566164
|
||||||
|
displayName: build
|
||||||
|
strategy: naturally
|
||||||
|
trigger: auto
|
||||||
|
executor: []
|
||||||
|
steps:
|
||||||
|
- step: execute@docker
|
||||||
|
name: execute_by_docker
|
||||||
|
displayName: 基于镜像的脚本执行
|
||||||
|
certificate: ''
|
||||||
|
image: docker.io/debian:buster-slim
|
||||||
|
command:
|
||||||
|
- sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
|
||||||
|
- '# 换源'
|
||||||
|
- apt update
|
||||||
|
- export DEBIAN_FRONTEND=noninteractive
|
||||||
|
- echo "安装git devscripts equivs ..."
|
||||||
|
- apt install git devscripts equivs curl -y >/dev/null 2>&1
|
||||||
|
- git clone https://gitlink.org.cn/shenmo7192/dtk-old-bundle.git
|
||||||
|
- cd dtk-old-bundle
|
||||||
|
- apt install ./*.deb -y
|
||||||
|
- cd ..
|
||||||
|
- rm -rf dtk-old-bundle
|
||||||
|
- 'mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes -y" '
|
||||||
|
- dpkg-buildpackage -b -us -uc
|
||||||
|
- cd ..
|
||||||
|
- ls -all
|
||||||
|
- pwd
|
||||||
|
strategy: {}
|
||||||
57
.workflow/dtk-build-release-tag-20220425.yml
Normal file
57
.workflow/dtk-build-release-tag-20220425.yml
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
version: '1.0'
|
||||||
|
name: dtk-build-release-tag-20220425
|
||||||
|
displayName: dtk-build-release-tag
|
||||||
|
triggers:
|
||||||
|
trigger: auto
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
prefix:
|
||||||
|
- ''
|
||||||
|
stages:
|
||||||
|
- name: stage-4e566164
|
||||||
|
displayName: build
|
||||||
|
strategy: naturally
|
||||||
|
trigger: auto
|
||||||
|
executor: []
|
||||||
|
steps:
|
||||||
|
- step: build@nodejs
|
||||||
|
name: build_dtk
|
||||||
|
displayName: DTK构建
|
||||||
|
nodeVersion: 14.16.0
|
||||||
|
commands:
|
||||||
|
- git clone https://gitlink.org.cn/shenmo7192/debian-10-container.git
|
||||||
|
- mv debian-10-container/Debian-10.tar.xz /mnt
|
||||||
|
- rm -rf debian-10-container
|
||||||
|
- WORK_DIR=`pwd`
|
||||||
|
- cd /mnt/
|
||||||
|
- tar -xf Debian-10.tar.xz
|
||||||
|
- cd Debian-10
|
||||||
|
- wget https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/spark-build.sh
|
||||||
|
- chmod +x spark-build.sh
|
||||||
|
- mkdir build-spark
|
||||||
|
- cp -r $WORK_DIR build-spark/spark-store
|
||||||
|
- echo "进入Debian 10环境"
|
||||||
|
- chroot /mnt/Debian-10 /bin/bash /spark-build.sh
|
||||||
|
- cd /mnt/Debian-10/build-spark
|
||||||
|
artifacts:
|
||||||
|
- name: BUILD_ARTIFACT
|
||||||
|
path:
|
||||||
|
- /mnt/Debian-10/build-spark/target
|
||||||
|
caches: []
|
||||||
|
notify: []
|
||||||
|
strategy:
|
||||||
|
retry: '0'
|
||||||
|
- name: stage-29f3ffbb
|
||||||
|
displayName: 上传
|
||||||
|
strategy: naturally
|
||||||
|
trigger: auto
|
||||||
|
executor: []
|
||||||
|
steps:
|
||||||
|
- step: publish@general_artifacts
|
||||||
|
name: publish_general_artifacts
|
||||||
|
displayName: 上传制品
|
||||||
|
dependArtifact: BUILD_ARTIFACT
|
||||||
|
artifactName: output
|
||||||
|
notify: []
|
||||||
|
strategy:
|
||||||
|
retry: '0'
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
version: '1.0'
|
|
||||||
name: dtk-build-commit-20220425
|
|
||||||
displayName: dtk-build-commit
|
|
||||||
triggers:
|
|
||||||
trigger: manual
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
prefix:
|
|
||||||
- master
|
|
||||||
tags:
|
|
||||||
prefix:
|
|
||||||
- ''
|
|
||||||
stages:
|
|
||||||
- name: stage-4e566164
|
|
||||||
displayName: build
|
|
||||||
strategy: naturally
|
|
||||||
trigger: auto
|
|
||||||
executor: []
|
|
||||||
steps:
|
|
||||||
- step: execute@docker
|
|
||||||
name: execute_by_docker
|
|
||||||
displayName: 基于镜像的脚本执行
|
|
||||||
certificate: d3a72e50-a6b5-013a-3031-5e77c3ac149e
|
|
||||||
image: hub.docker.com/r/shenmo7192/uos-21-dtk5.4
|
|
||||||
command:
|
|
||||||
- git clone https://gitee.com/deepin-community-store/spark-store
|
|
||||||
- mkdir debs
|
|
||||||
- cd spark-store
|
|
||||||
- dpkg-buildpackage
|
|
||||||
- mv *.deb ../debs
|
|
||||||
- cd ../debs
|
|
||||||
- curl -s --url "smtp://smtp.163.com" --mail-from "sparkstorefeedback@163.com" --mail-rcpt "shenmo@spark-app.store" --upload-file ./*.deb --user "sparkstorefeedback@163.com:YWYGLQNOPLWNNJJY"
|
|
||||||
permissions:
|
|
||||||
- role: admin
|
|
||||||
members: []
|
|
||||||
@@ -22,7 +22,7 @@ If you want to submit an APP to share with others,Please [Click here](https://
|
|||||||
|
|
||||||
If you simply want to install the Spark Store,just enter the [Release] page, find the version you want and install.
|
If you simply want to install the Spark Store,just enter the [Release] page, find the version you want and install.
|
||||||
|
|
||||||
If you are using Debian11/Ubuntu 20.04, you will need extra dependency package. Available [here](https://d.store.deepinos.org.cn/spark-store-dependencies-kylin.zip)
|
If you are using Debian11/Ubuntu 20.04, you will need extra dependency package. Available [here](https://code.gitlink.org.cn/shenmo7192/spark-store-dependencies/raw/branch/master/spark-store-dependencies-kylin.zip)
|
||||||
|
|
||||||
---
|
---
|
||||||
#### Compile and developement
|
#### Compile and developement
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
如果想安装 `星火应用商店` ,请打开右侧的 [Release] 页面,找到最新版本,并选择适用于当前系统的安装包下载。
|
如果想安装 `星火应用商店` ,请打开右侧的 [Release] 页面,找到最新版本,并选择适用于当前系统的安装包下载。
|
||||||
|
|
||||||
如果你在使用 `Debian 11/Ubuntu 20.04`,你需要额外下载[依赖补充包](https://d.store.deepinos.org.cn/spark-store-dependencies-kylin.zip)
|
如果你在使用 `Debian 11/Ubuntu 20.04`,你需要额外下载[依赖补充包](https://code.gitlink.org.cn/shenmo7192/spark-store-dependencies/raw/branch/master/spark-store-dependencies-kylin.zip)
|
||||||
|
|
||||||
---
|
---
|
||||||
#### 编译安装
|
#### 编译安装
|
||||||
|
|||||||
41
debian/changelog
vendored
41
debian/changelog
vendored
@@ -1,3 +1,44 @@
|
|||||||
|
spark-store (3.2.2) stable; urgency=medium
|
||||||
|
|
||||||
|
* aptss will now refresh the system source before doing install, policy....etc
|
||||||
|
* 启动客户端GPU加速支持
|
||||||
|
|
||||||
|
-- shenmo <shenmo@spark-app.store> Fri, 30 Jan 2022 00:00:00 +0800
|
||||||
|
|
||||||
|
spark-store (3.2.1) stable; urgency=medium
|
||||||
|
|
||||||
|
* 更改刷新系统源的功能
|
||||||
|
|
||||||
|
|
||||||
|
-- shenmo <shenmo@spark-app.store> Fri, 30 Jan 2022 00:00:00 +0800
|
||||||
|
|
||||||
|
spark-store (3.2) stable; urgency=medium
|
||||||
|
|
||||||
|
* 新增 下载量统计功能
|
||||||
|
* 新增 显示下载量
|
||||||
|
* 修复 spk链接生成错误
|
||||||
|
* 调整 启动时检测商店applist源
|
||||||
|
* 新增 applist cdn加速
|
||||||
|
* 调整 ssupdate不再更新/etc/aptss下的cache,如要如此,请使用aptss update
|
||||||
|
* 修复 在更新检测设置中的是否开启自动更新检测设置项的显示不随开启或关闭状态改变
|
||||||
|
* 修复 在检测更新时临时降低优先级到100,防止系统中有且版本一致的包被反复来回更新
|
||||||
|
|
||||||
|
-- shenmo <shenmo@spark-app.store> Fri, 30 Jan 2022 00:00:00 +0800
|
||||||
|
|
||||||
|
spark-store (3.1.6) stable; urgency=medium
|
||||||
|
|
||||||
|
* 修复部分情况下无法选中正确的镜像源的问题
|
||||||
|
* 合入3.1.5以来的各项修改
|
||||||
|
|
||||||
|
-- shenmo <shenmo@spark-app.store> Fri, 30 Jan 2022 00:00:00 +0800
|
||||||
|
|
||||||
|
spark-store (3.1.5-5) stable; urgency=medium
|
||||||
|
|
||||||
|
* 从所有镜像源中选取最快镜像源高速下载
|
||||||
|
|
||||||
|
-- shenmo <shenmo@spark-app.store> Fri, 30 Jan 2022 00:00:00 +0800
|
||||||
|
|
||||||
|
|
||||||
spark-store (3.1.5-4) stable; urgency=medium
|
spark-store (3.1.5-4) stable; urgency=medium
|
||||||
|
|
||||||
* 更改ss-apt-fast策略,现在只会在update,ssupdate和没有检测到配置文件的时候更新配置文件
|
* 更改ss-apt-fast策略,现在只会在update,ssupdate和没有检测到配置文件的时候更新配置文件
|
||||||
|
|||||||
4
debian/control
vendored
4
debian/control
vendored
@@ -34,9 +34,11 @@ Depends:${shlibs:Depends}, ${misc:Depends},
|
|||||||
libdtkwidget5,
|
libdtkwidget5,
|
||||||
libnotify4,
|
libnotify4,
|
||||||
curl,
|
curl,
|
||||||
|
openssl,
|
||||||
dde-qt5integration,
|
dde-qt5integration,
|
||||||
bubblewrap,
|
bubblewrap,
|
||||||
aria2
|
aria2,
|
||||||
|
gcc
|
||||||
Description: Spark Store
|
Description: Spark Store
|
||||||
A community powered app store, based on DTK.
|
A community powered app store, based on DTK.
|
||||||
Recommends: apt-fast
|
Recommends: apt-fast
|
||||||
|
|||||||
9
debian/spark-store.postinst
vendored
9
debian/spark-store.postinst
vendored
@@ -6,6 +6,11 @@ case "$1" in
|
|||||||
# config for aptss
|
# config for aptss
|
||||||
mkdir -p /etc/aptss/sources.list.d
|
mkdir -p /etc/aptss/sources.list.d
|
||||||
ln -s -f /etc/apt/sources.list /etc/aptss/sources.list
|
ln -s -f /etc/apt/sources.list /etc/aptss/sources.list
|
||||||
|
|
||||||
|
# Remove the sources.list file
|
||||||
|
if [ -e /etc/apt/sources.list.d/sparkstore.list ];then
|
||||||
|
rm /etc/apt/sources.list.d/sparkstore.list
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Check if /usr/local/bin existed
|
# Check if /usr/local/bin existed
|
||||||
@@ -19,9 +24,11 @@ case "$1" in
|
|||||||
ln -s -f /opt/durapps/spark-store/bin/spark-dstore-patch /usr/local/bin/spark-dstore-patch
|
ln -s -f /opt/durapps/spark-store/bin/spark-dstore-patch /usr/local/bin/spark-dstore-patch
|
||||||
ln -s -f /opt/durapps/spark-store/bin/aptss /usr/local/bin/ss-apt-fast
|
ln -s -f /opt/durapps/spark-store/bin/aptss /usr/local/bin/ss-apt-fast
|
||||||
|
|
||||||
ln -s -f /opt/durapps/spark-store/bin/aptss /usr/bin/aptss
|
ln -s -f /opt/durapps/spark-store/bin/aptss /usr/bin/aptss
|
||||||
|
|
||||||
|
# Compile the Sender module
|
||||||
|
|
||||||
|
gcc /opt/durapps/spark-store/bin/ss-feedback/sender-d.sh.c -o /opt/durapps/spark-store/bin/ss-feedback/sender-d
|
||||||
|
|
||||||
# Download and install key
|
# Download and install key
|
||||||
mkdir -p /tmp/spark-store-install/
|
mkdir -p /tmp/spark-store-install/
|
||||||
|
|||||||
3
debian/spark-store.prerm
vendored
3
debian/spark-store.prerm
vendored
@@ -11,6 +11,9 @@ rm /usr/bin/aptss
|
|||||||
|
|
||||||
rm -rf /etc/aptss/
|
rm -rf /etc/aptss/
|
||||||
|
|
||||||
|
# Remove Sender module
|
||||||
|
rm /opt/durapps/spark-store/bin/ss-feedback/sender-d
|
||||||
|
|
||||||
# Remove residual symbol links to stop upgrade detect if exist
|
# Remove residual symbol links to stop upgrade detect if exist
|
||||||
if [ -e /etc/xdg/autostart/spark-update-notifier.desktop ];then
|
if [ -e /etc/xdg/autostart/spark-update-notifier.desktop ];then
|
||||||
rm /etc/xdg/autostart/spark-update-notifier.desktop
|
rm /etc/xdg/autostart/spark-update-notifier.desktop
|
||||||
|
|||||||
@@ -6,4 +6,4 @@ Subject: spark-store_3.0.2: $(lsb_release -a | grep "Description" | sed -e "s#\t
|
|||||||
|
|
||||||
$(uname -a)" | tee /tmp/spark-store-install/feedback.txt > /dev/null
|
$(uname -a)" | tee /tmp/spark-store-install/feedback.txt > /dev/null
|
||||||
|
|
||||||
curl -s --url "smtp://smtp.163.com" --mail-from "sparkstorefeedback@163.com" --mail-rcpt "sparkstorefeedback@163.com" --upload-file /tmp/spark-store-install/feedback.txt --user "sparkstorefeedback@163.com:YWYGLQNOPLWNNJJY"
|
curl -s --url "smtp://smtp.163.com" --mail-from "${MAIL_FEEDBACK}" --mail-rcpt "${MAIL_FEEDBACK}" --upload-file /tmp/spark-store-install/feedback.txt --user "${MAIL_FEEDBACK}:${M}AIL_AUTH"
|
||||||
|
|||||||
@@ -99,15 +99,16 @@ void DownloadController::startDownload(const QString &url)
|
|||||||
gennerateDomain(domains);
|
gennerateDomain(domains);
|
||||||
// qDebug() << domains << domains.size();
|
// qDebug() << domains << domains.size();
|
||||||
}
|
}
|
||||||
QDir tmpdir("/tmp/spark-store/");
|
|
||||||
QString aria2Command = "-d";
|
QString aria2Command = "-d";
|
||||||
QString aria2Urls = "";
|
QString aria2Urls = "";
|
||||||
QString aria2Verbose = "--summary-interval=1";
|
QString aria2Verbose = "--summary-interval=1";
|
||||||
QString aria2Threads = "--split=16";
|
QString aria2SizePerThreads = "--min-split-size=1M";
|
||||||
QString aria2NoConfig = "--no-conf";
|
QString aria2NoConfig = "--no-conf";
|
||||||
QString aria2NoSeeds = "--seed-time=0";
|
QString aria2NoSeeds = "--seed-time=0";
|
||||||
QStringList command;
|
QStringList command;
|
||||||
QString downloadDir = "/tmp/spark-store/";
|
QString downloadDir = "/tmp/spark-store/";
|
||||||
|
QString aria2ConnectionPerServer = "--max-connection-per-server=1";
|
||||||
|
|
||||||
if (useMetalink){
|
if (useMetalink){
|
||||||
command.append(metaUrl.toUtf8());
|
command.append(metaUrl.toUtf8());
|
||||||
@@ -127,7 +128,8 @@ void DownloadController::startDownload(const QString &url)
|
|||||||
command.append(downloadDir.toUtf8());
|
command.append(downloadDir.toUtf8());
|
||||||
command.append(aria2Verbose.toUtf8());
|
command.append(aria2Verbose.toUtf8());
|
||||||
command.append(aria2NoConfig.toUtf8());
|
command.append(aria2NoConfig.toUtf8());
|
||||||
command.append(aria2Threads.toUtf8());
|
command.append(aria2SizePerThreads.toUtf8());
|
||||||
|
command.append(aria2ConnectionPerServer.toUtf8());
|
||||||
if (useMetalink){
|
if (useMetalink){
|
||||||
command.append(aria2NoSeeds.toUtf8());
|
command.append(aria2NoSeeds.toUtf8());
|
||||||
}
|
}
|
||||||
@@ -196,6 +198,15 @@ void DownloadController::startDownload(const QString &url)
|
|||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 统计下载量
|
||||||
|
QString SenderdPath = "/opt/durapps/spark-store/bin/ss-feedback/sender-d";
|
||||||
|
/*
|
||||||
|
* https://en.wikipedia.org/wiki/HD_70642
|
||||||
|
* HD 70642 is a star with an exoplanetary companion in the southern constellation of Puppis.
|
||||||
|
*/
|
||||||
|
system(SenderdPath.toUtf8() + " " + metaUrl.toUtf8() + " " + "HD70642");
|
||||||
|
|
||||||
emit downloadFinished(); });
|
emit downloadFinished(); });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,10 @@ int main(int argc, char *argv[])
|
|||||||
DApplication::loadDXcbPlugin(); // 已废弃,但是对于非deepin桌面可以正常使用标题栏
|
DApplication::loadDXcbPlugin(); // 已废弃,但是对于非deepin桌面可以正常使用标题栏
|
||||||
DApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // 开启 Hidpi 支持
|
DApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // 开启 Hidpi 支持
|
||||||
// 程序内强制添加"-platformtheme deepin"参数喂给Qt让Qt正确使用Deepin主题修复各种奇怪样式问题
|
// 程序内强制添加"-platformtheme deepin"参数喂给Qt让Qt正确使用Deepin主题修复各种奇怪样式问题
|
||||||
|
|
||||||
|
// 浏览器开启 GPU 支持
|
||||||
|
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blacklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode");
|
||||||
|
|
||||||
QVector<char*> fakeArgs(argc + 2);
|
QVector<char*> fakeArgs(argc + 2);
|
||||||
fakeArgs[0] = argv[0];
|
fakeArgs[0] = argv[0];
|
||||||
fakeArgs[1] = "-platformtheme";
|
fakeArgs[1] = "-platformtheme";
|
||||||
@@ -30,7 +34,7 @@ int main(int argc, char *argv[])
|
|||||||
DAboutDialog dialog;
|
DAboutDialog dialog;
|
||||||
a.setAboutDialog(&dialog);
|
a.setAboutDialog(&dialog);
|
||||||
dialog.setLicense(QObject::tr("We publish this program under GPL V3"));
|
dialog.setLicense(QObject::tr("We publish this program under GPL V3"));
|
||||||
dialog.setVersion(DApplication::buildVersion("Version 3.1.5-4"));
|
dialog.setVersion(DApplication::buildVersion("Version 3.2.2"));
|
||||||
dialog.setProductIcon(QIcon::fromTheme("spark-store")); // 设置Logo
|
dialog.setProductIcon(QIcon::fromTheme("spark-store")); // 设置Logo
|
||||||
dialog.setProductName(QLabel::tr("Spark Store"));
|
dialog.setProductName(QLabel::tr("Spark Store"));
|
||||||
dialog.setDescription(
|
dialog.setDescription(
|
||||||
@@ -51,7 +55,7 @@ int main(int argc, char *argv[])
|
|||||||
a.setOrganizationName("spark-union");
|
a.setOrganizationName("spark-union");
|
||||||
a.setOrganizationDomain("https://www.deepinos.org/");
|
a.setOrganizationDomain("https://www.deepinos.org/");
|
||||||
a.setApplicationName("Spark Store"); //不需要翻译,否则 ~/.local/share/ 下文件夹名称也被翻译为中文
|
a.setApplicationName("Spark Store"); //不需要翻译,否则 ~/.local/share/ 下文件夹名称也被翻译为中文
|
||||||
a.setApplicationVersion(DApplication::buildVersion("3.1.5-4"));
|
a.setApplicationVersion(DApplication::buildVersion("3.2.2"));
|
||||||
a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
|
a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
|
||||||
a.setApplicationDescription(
|
a.setApplicationDescription(
|
||||||
QObject::tr(
|
QObject::tr(
|
||||||
|
|||||||
105
src/widget.cpp
105
src/widget.cpp
@@ -94,7 +94,7 @@ Widget::Widget(DBlurEffectWidget *parent) :
|
|||||||
connect(searchEdit, &DSearchEdit::returnPressed, this, [=]()
|
connect(searchEdit, &DSearchEdit::returnPressed, this, [=]()
|
||||||
{
|
{
|
||||||
qDebug() << "触发了搜索,呜啦啦啦!";
|
qDebug() << "触发了搜索,呜啦啦啦!";
|
||||||
QString searchtext = searchEdit->text();
|
QString searchtext = searchEdit->text().replace("\r","");
|
||||||
if(!searchtext.isEmpty())
|
if(!searchtext.isEmpty())
|
||||||
{
|
{
|
||||||
qDebug() << searchEdit->text();
|
qDebug() << searchEdit->text();
|
||||||
@@ -292,18 +292,20 @@ void Widget::initConfig()
|
|||||||
|
|
||||||
// 读取服务器URL并初始化菜单项的链接
|
// 读取服务器URL并初始化菜单项的链接
|
||||||
QSettings readConfig(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat);
|
QSettings readConfig(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat);
|
||||||
if(!readConfig.value("server/choose").toString().isEmpty())
|
if(!readConfig.value("server/choose").toString().isEmpty() && readConfig.value("server/updated").toString() == "TRUE")
|
||||||
{
|
{
|
||||||
ui->comboBox_server->setCurrentText(readConfig.value("server/choose").toString());
|
ui->comboBox_server->setCurrentText(readConfig.value("server/choose").toString());
|
||||||
appinfoLoadThread.setServer(serverUrl = readConfig.value("server/choose").toString());
|
appinfoLoadThread.setServer(serverUrl = readConfig.value("server/choose").toString());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
appinfoLoadThread.setServer(serverUrl = "https://d.store.deepinos.org.cn/"); // 默认URL
|
this->cdnSeverUrl = "https://cdn.d.store.deepinos.org.cn/";
|
||||||
|
appinfoLoadThread.setServer(serverUrl = this->cdnSeverUrl); // 默认URL
|
||||||
}
|
}
|
||||||
configCanSave = true; // 防止触发保存配置信号
|
configCanSave = true; // 防止触发保存配置信号
|
||||||
|
|
||||||
// menuUrl[0] = "http://127.0.0.1:8000/#/darkprogramming";
|
// menuUrl[0] = "http://127.0.0.1:8000/#/darkprogramming";
|
||||||
|
qDebug() << "serverUrl: " << serverUrl;
|
||||||
menuUrl[0] = serverUrl + "store/#/";
|
menuUrl[0] = serverUrl + "store/#/";
|
||||||
menuUrl[1] = serverUrl + "store/#/network";
|
menuUrl[1] = serverUrl + "store/#/network";
|
||||||
menuUrl[2] = serverUrl + "store/#/relations";
|
menuUrl[2] = serverUrl + "store/#/relations";
|
||||||
@@ -1026,11 +1028,13 @@ void Widget::on_comboBox_server_currentIndexChanged(const QString &arg1)
|
|||||||
{
|
{
|
||||||
appinfoLoadThread.setServer(arg1); // 服务器信息更新
|
appinfoLoadThread.setServer(arg1); // 服务器信息更新
|
||||||
|
|
||||||
|
const QString updatedInfo = "TRUE";
|
||||||
if(configCanSave)
|
if(configCanSave)
|
||||||
{
|
{
|
||||||
// ui->label_setting1->show();
|
// ui->label_setting1->show();
|
||||||
QSettings *setConfig = new QSettings(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat);
|
QSettings *setConfig = new QSettings(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat);
|
||||||
setConfig->setValue("server/choose", arg1);
|
setConfig->setValue("server/choose", arg1);
|
||||||
|
setConfig->setValue("server/updated", updatedInfo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1086,77 +1090,13 @@ void Widget::on_pushButton_updateApt_clicked()
|
|||||||
ui->pushButton_updateApt->setEnabled(false);
|
ui->pushButton_updateApt->setEnabled(false);
|
||||||
ui->label_aptserver->setText(tr("Updating, please wait..."));
|
ui->label_aptserver->setText(tr("Updating, please wait..."));
|
||||||
|
|
||||||
std::fstream sourcesList, policy, update;
|
QString storeSpk = "spk://store/tools/spark-store";
|
||||||
QDir tmpdir("/tmp");
|
openUrl(storeSpk);
|
||||||
auto tmpPath = QString::fromUtf8(TMP_PATH).toStdString();
|
ui->label_aptserver->setText(tr(""));
|
||||||
bool unknownError = true;
|
|
||||||
|
|
||||||
tmpdir.mkpath("spark-store");
|
|
||||||
sourcesList.open(tmpPath + "/sparkstore.list", std::ios::out);
|
|
||||||
// 商店已经下架会替换系统库的包,优先级 policy 弃用
|
|
||||||
// policy.open(tmpPath + "/sparkstore", std::ios::out);
|
|
||||||
|
|
||||||
if(sourcesList /*&& policy*/)
|
|
||||||
{
|
|
||||||
auto serverAddr = ui->comboBox_server->currentText();
|
|
||||||
|
|
||||||
sourcesList << "deb [by-hash=force] ";
|
|
||||||
sourcesList << serverAddr.toUtf8().toStdString();
|
|
||||||
sourcesList << " /";
|
|
||||||
sourcesList.close();
|
|
||||||
|
|
||||||
/*
|
|
||||||
* policy << "Package: *\n" << "Pin: origin *" <<
|
|
||||||
* serverAddr.mid(serverAddr.indexOf('.')).toUtf8().toStdString() << "\n" <<
|
|
||||||
* "Pin-Priority: 90"; // 降低星火源的优先级,防止从星火安装已存在的系统包,破坏依赖
|
|
||||||
* policy.close();
|
|
||||||
*/
|
|
||||||
|
|
||||||
update.open(tmpPath + "/update.sh", std::ios::out);
|
|
||||||
if(update)
|
|
||||||
{
|
|
||||||
unknownError = false;
|
|
||||||
update << "#!/bin/sh\n" <<
|
|
||||||
"mv " + tmpPath + "/sparkstore.list /etc/apt/sources.list.d/sparkstore.list && " <<
|
|
||||||
// "mv " + tmpPath + "/sparkstore /etc/apt/preferences.d/sparkstore && " <<
|
|
||||||
"apt update";
|
|
||||||
update.close();
|
|
||||||
|
|
||||||
system(("chmod +x " + tmpPath + "/update.sh").c_str());
|
|
||||||
|
|
||||||
QProcess runupdate;
|
|
||||||
runupdate.start("pkexec", QStringList() << QString::fromStdString(tmpPath + "/update.sh"));
|
|
||||||
runupdate.waitForFinished();
|
|
||||||
QString error = runupdate.readAllStandardError();
|
|
||||||
|
|
||||||
QStringList everyError = error.split("\n");
|
|
||||||
bool haveError = false;
|
|
||||||
for(int i = 0; i < everyError.size(); i++)
|
|
||||||
{
|
|
||||||
if(everyError[i].left(2) == "E:")
|
|
||||||
{
|
|
||||||
haveError = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!haveError)
|
|
||||||
{
|
|
||||||
ui->label_aptserver->setText("deb [by-hash=force] " + ui->comboBox_server->currentText().toUtf8() + " /");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ui->label_aptserver->setText(tr("Apt has reported an error. Please use apt update in terminal to locate the problem."));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(unknownError)
|
|
||||||
{
|
|
||||||
ui->label_aptserver->setText(tr("Unknown error!"));
|
|
||||||
}
|
|
||||||
|
|
||||||
ui->pushButton_updateApt->setEnabled(true);
|
ui->pushButton_updateApt->setEnabled(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Widget::on_pushButton_uninstall_clicked()
|
void Widget::on_pushButton_uninstall_clicked()
|
||||||
@@ -1208,6 +1148,16 @@ void Widget::on_pushButton_clear_clicked() // 清空临时缓存目录
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Widget::on_pushButton_clearWebCache_clicked()
|
||||||
|
{
|
||||||
|
QtConcurrent::run([=]()
|
||||||
|
{
|
||||||
|
|
||||||
|
QString dataLocal = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
|
||||||
|
QDir cacheDir(dataLocal );
|
||||||
|
cacheDir.removeRecursively(); });
|
||||||
|
}
|
||||||
|
|
||||||
quint64 Widget::dirFileSize(const QString &path)
|
quint64 Widget::dirFileSize(const QString &path)
|
||||||
{
|
{
|
||||||
QDir dir(path);
|
QDir dir(path);
|
||||||
@@ -1308,13 +1258,16 @@ void Widget::on_stackedWidget_currentChanged(int arg1)
|
|||||||
void Widget::on_webEngineView_urlChanged(const QUrl &arg1)
|
void Widget::on_webEngineView_urlChanged(const QUrl &arg1)
|
||||||
{
|
{
|
||||||
//分析出服务器中的分类名称
|
//分析出服务器中的分类名称
|
||||||
QStringList url_ = arg1.path().split("/");
|
QStringList url_ = arg1.path().replace("//", "/").split("/");
|
||||||
QString pname;
|
QString pname;
|
||||||
if(url_.size() > 3)
|
qDebug() << "URL size:" << url_.size();
|
||||||
|
if (url_.size() > 3)
|
||||||
{
|
{
|
||||||
type_name = url_[2];
|
type_name = url_[2];
|
||||||
pname = url_[3];
|
pname = url_[3];
|
||||||
}
|
}
|
||||||
|
qDebug() << "type_name:" << type_name << ";pname" << pname;
|
||||||
|
|
||||||
//如果是app.json就打开详情页
|
//如果是app.json就打开详情页
|
||||||
if(arg1.path().right(8) == "app.json")
|
if(arg1.path().right(8) == "app.json")
|
||||||
{
|
{
|
||||||
@@ -1328,8 +1281,8 @@ void Widget::on_webEngineView_urlChanged(const QUrl &arg1)
|
|||||||
ui->label_appname->clear();
|
ui->label_appname->clear();
|
||||||
ui->pushButton_download->setEnabled(false);
|
ui->pushButton_download->setEnabled(false);
|
||||||
ui->stackedWidget->setCurrentIndex(2);
|
ui->stackedWidget->setCurrentIndex(2);
|
||||||
qDebug() << "https://d.store.deepinos.org.cn/" + type_name + "/" + pname;
|
|
||||||
qDebug() << "链接地址:" << arg1;
|
qDebug() << "程序跳转链接地址:" << arg1;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
load.cancel(); // 打开并发加载线程前关闭正在执行的线程
|
load.cancel(); // 打开并发加载线程前关闭正在执行的线程
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ class DownloadController;
|
|||||||
namespace AeaQt {
|
namespace AeaQt {
|
||||||
class HttpClient;
|
class HttpClient;
|
||||||
}
|
}
|
||||||
|
|
||||||
class Widget : public DBlurEffectWidget
|
class Widget : public DBlurEffectWidget
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
@@ -92,6 +91,7 @@ private slots:
|
|||||||
void on_pushButton_updateApt_clicked();
|
void on_pushButton_updateApt_clicked();
|
||||||
void on_pushButton_uninstall_clicked();
|
void on_pushButton_uninstall_clicked();
|
||||||
void on_pushButton_clear_clicked();
|
void on_pushButton_clear_clicked();
|
||||||
|
void on_pushButton_clearWebCache_clicked();
|
||||||
void on_pushButton_website_clicked();
|
void on_pushButton_website_clicked();
|
||||||
void on_pushButton_clicked();
|
void on_pushButton_clicked();
|
||||||
void on_btn_openDir_clicked();
|
void on_btn_openDir_clicked();
|
||||||
@@ -105,6 +105,7 @@ private slots:
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
QUrl url;
|
QUrl url;
|
||||||
|
QString cdnSeverUrl;
|
||||||
|
|
||||||
downloadlist download_list[LIST_MAX];
|
downloadlist download_list[LIST_MAX];
|
||||||
Ui::Widget *ui;
|
Ui::Widget *ui;
|
||||||
|
|||||||
@@ -345,7 +345,7 @@
|
|||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>2</number>
|
<number>3</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="page">
|
<widget class="QWidget" name="page">
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
<layout class="QVBoxLayout" name="verticalLayout_4">
|
||||||
@@ -489,7 +489,7 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>903</width>
|
<width>889</width>
|
||||||
<height>849</height>
|
<height>849</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
@@ -993,8 +993,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>869</width>
|
<width>851</width>
|
||||||
<height>325</height>
|
<height>324</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||||
@@ -1123,8 +1123,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>738</width>
|
<width>889</width>
|
||||||
<height>886</height>
|
<height>716</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_23">
|
<layout class="QVBoxLayout" name="verticalLayout_23">
|
||||||
@@ -1220,7 +1220,7 @@
|
|||||||
<string notr="true">color:#808080</string>
|
<string notr="true">color:#808080</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string><html><head/><body><p>The role of the source server is to ensure that the software is updated, and supports the use of the apt tool to get the software. We usually prefer that you use the first line as the update source, which is generally the most stable. </p></body></html></string>
|
<string><html><head/><body><p>Check update for Spark Store. </p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap">
|
<property name="wordWrap">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
@@ -1237,7 +1237,7 @@
|
|||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="label_6">
|
<widget class="QLabel" name="label_6">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Source Server</string>
|
<string>Spark Store Update</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -1285,7 +1285,31 @@
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QWidget" name="widget_10" native="true">
|
<widget class="QWidget" name="widget_10" native="true">
|
||||||
<layout class="QGridLayout" name="gridLayout_4">
|
<layout class="QGridLayout" name="gridLayout_4">
|
||||||
<item row="0" column="3">
|
<item row="2" column="0" colspan="5">
|
||||||
|
<widget class="QLabel" name="label_12">
|
||||||
|
<property name="styleSheet">
|
||||||
|
<string notr="true">color:#808080</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Since the dictionary is at /tmp,It would be cleaned automatically when system reboot.</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QLabel" name="tmp_size_ui">
|
||||||
|
<property name="text">
|
||||||
|
<string>0B</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="0" colspan="2">
|
||||||
|
<widget class="QLabel" name="label_11">
|
||||||
|
<property name="text">
|
||||||
|
<string>Location:/tmp/spark-store</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="4">
|
||||||
<spacer name="horizontalSpacer_5">
|
<spacer name="horizontalSpacer_5">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
@@ -1305,16 +1329,6 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="0" colspan="4">
|
|
||||||
<widget class="QLabel" name="label_12">
|
|
||||||
<property name="styleSheet">
|
|
||||||
<string notr="true">color:#808080</string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Since the dictionary is at /tmp,It would be cleaned automatically when system reboot.</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QLabel" name="label_13">
|
<widget class="QLabel" name="label_13">
|
||||||
<property name="maximumSize">
|
<property name="maximumSize">
|
||||||
@@ -1328,17 +1342,10 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="1">
|
<item row="0" column="3">
|
||||||
<widget class="QLabel" name="tmp_size_ui">
|
<widget class="QPushButton" name="pushButton_clearWebCache">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>0B</string>
|
<string>Clear Web Cache</string>
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="0" colspan="2">
|
|
||||||
<widget class="QLabel" name="label_11">
|
|
||||||
<property name="text">
|
|
||||||
<string>Location:/tmp/spark-store</string>
|
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|||||||
@@ -13,8 +13,29 @@ void SpkAppInfoLoaderThread::run()
|
|||||||
emit requestResetUi();
|
emit requestResetUi();
|
||||||
|
|
||||||
httpClient = new AeaQt::HttpClient;
|
httpClient = new AeaQt::HttpClient;
|
||||||
|
QString oriSeverUrl = "https://d.store.deepinos.org.cn";
|
||||||
|
QString cdnSeverUrl = "https://cdn.d.store.deepinos.org.cn";
|
||||||
|
|
||||||
httpClient->get(targetUrl.toString())
|
QString downloadTimesUrl = targetUrl.toString();
|
||||||
|
downloadTimesUrl = downloadTimesUrl.replace(oriSeverUrl, cdnSeverUrl);
|
||||||
|
downloadTimesUrl = downloadTimesUrl.replace("app.json", "download-times.txt");
|
||||||
|
httpClient->get(downloadTimesUrl)
|
||||||
|
.onResponse([this](QString downloadTimesFeedback)
|
||||||
|
{
|
||||||
|
qDebug() << "请求应用下载量信息 " << downloadTimesFeedback;
|
||||||
|
this->downloadTimes = downloadTimesFeedback.replace("\n","");
|
||||||
|
})
|
||||||
|
.onError([this](QString errorStr)
|
||||||
|
{
|
||||||
|
qDebug() << "请求下载量失败:" << errorStr;
|
||||||
|
this->downloadTimes = "0";
|
||||||
|
})
|
||||||
|
.block()
|
||||||
|
.timeout(3*1000)
|
||||||
|
.exec();
|
||||||
|
|
||||||
|
|
||||||
|
httpClient->get(targetUrl.toString().replace(oriSeverUrl, cdnSeverUrl))
|
||||||
.header("content-type", "application/json")
|
.header("content-type", "application/json")
|
||||||
.onResponse([this](QByteArray json_array)
|
.onResponse([this](QByteArray json_array)
|
||||||
{
|
{
|
||||||
@@ -29,8 +50,12 @@ void SpkAppInfoLoaderThread::run()
|
|||||||
|
|
||||||
QString deburl = serverUrl;
|
QString deburl = serverUrl;
|
||||||
deburl = deburl.left(urladdress.length() - 1);
|
deburl = deburl.left(urladdress.length() - 1);
|
||||||
urladdress = "https://d.store.deepinos.org.cn/"; // 使用图片专用服务器请保留这行,删除后将使用源服务器
|
|
||||||
urladdress = urladdress.left(urladdress.length() - 1);
|
QStringList url_ = targetUrl.toString().replace("//", "/").split("/");
|
||||||
|
urladdress = "https://" + url_[1];
|
||||||
|
// 使用 cdn 服务器
|
||||||
|
urladdress = "https://cdn.d.store.deepinos.org.cn"; // 使用图片专用服务器请保留这行,删除后将使用源服务器
|
||||||
|
|
||||||
|
|
||||||
for(int i = 3; i < downloadurl.size(); i++)
|
for(int i = 3; i < downloadurl.size(); i++)
|
||||||
{
|
{
|
||||||
@@ -60,7 +85,8 @@ void SpkAppInfoLoaderThread::run()
|
|||||||
}
|
}
|
||||||
details += tr("Contributor: ") + json["Contributor"].toString() + "\n";
|
details += tr("Contributor: ") + json["Contributor"].toString() + "\n";
|
||||||
details += tr("Update Time: ") + json["Update"].toString() + "\n";
|
details += tr("Update Time: ") + json["Update"].toString() + "\n";
|
||||||
details += tr("Installed Size: ") + json["Size"].toString() + "\n";
|
details += tr("Installed Size: ") + json["Size"].toString() + "\n\n";
|
||||||
|
details += tr("Download Times: ") + this->downloadTimes + "\n";
|
||||||
more = json["More"].toString();
|
more = json["More"].toString();
|
||||||
|
|
||||||
QProcess isInstall;
|
QProcess isInstall;
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ protected:
|
|||||||
private:
|
private:
|
||||||
QUrl targetUrl;
|
QUrl targetUrl;
|
||||||
QString serverUrl;
|
QString serverUrl;
|
||||||
|
QString downloadTimes;
|
||||||
bool finishedDownload = false;
|
bool finishedDownload = false;
|
||||||
int downloaderRetval = 0;
|
int downloaderRetval = 0;
|
||||||
|
|
||||||
|
|||||||
44
tool/aptss
44
tool/aptss
@@ -1,11 +1,5 @@
|
|||||||
#/bin/bash
|
#/bin/bash
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] || [ "$1" = "download" ] ; then
|
|
||||||
|
|
||||||
if [ ! -e "/tmp/aptss-conf/apt-fast.conf" ];then
|
if [ ! -e "/tmp/aptss-conf/apt-fast.conf" ];then
|
||||||
###刷新apt-fast配置
|
###刷新apt-fast配置
|
||||||
mkdir -p /tmp/aptss-conf/
|
mkdir -p /tmp/aptss-conf/
|
||||||
@@ -17,10 +11,35 @@ chmod -R 755 /tmp/aptss-conf
|
|||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] ; then
|
||||||
|
|
||||||
DEPEND=`which apt-fast`
|
DEPEND=`which apt-fast`
|
||||||
if [ "$DEPEND" = "" ] ; then
|
if [ "$DEPEND" = "" ] ; then
|
||||||
echo "未安装依赖:apt-fast 开始安装"
|
echo "未安装依赖:apt-fast 开始安装"
|
||||||
sudo aptss ssupdate && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y
|
aptss ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y
|
||||||
|
fi
|
||||||
|
|
||||||
|
sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list" -o Dir::etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
|
||||||
|
|
||||||
|
###执行
|
||||||
|
bwrap --dev-bind / / \
|
||||||
|
--bind '/tmp/aptss-conf/apt-fast.conf' /etc/apt-fast.conf \
|
||||||
|
--bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \
|
||||||
|
apt-fast "$@" --allow-downgrades
|
||||||
|
|
||||||
|
|
||||||
|
elif [ "$1" = "download" ];then
|
||||||
|
DEPEND=`which apt-fast`
|
||||||
|
if [ "$DEPEND" = "" ] ; then
|
||||||
|
echo "未安装依赖:apt-fast 开始安装"
|
||||||
|
aptss ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y
|
||||||
fi
|
fi
|
||||||
|
|
||||||
###执行
|
###执行
|
||||||
@@ -30,6 +49,15 @@ bwrap --dev-bind / / \
|
|||||||
apt-fast "$@" --allow-downgrades
|
apt-fast "$@" --allow-downgrades
|
||||||
|
|
||||||
|
|
||||||
|
elif [ "$1" = "policy" ] || [ "$1" = "search" ];then
|
||||||
|
sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list" -o Dir::etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
|
||||||
|
|
||||||
|
###执行
|
||||||
|
bwrap --dev-bind / / \
|
||||||
|
--bind '/tmp/aptss-conf/apt-fast.conf' /etc/apt-fast.conf \
|
||||||
|
--bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \
|
||||||
|
apt "$@" --allow-downgrades
|
||||||
|
|
||||||
elif [ "$1" = "ssupdate" ];then
|
elif [ "$1" = "ssupdate" ];then
|
||||||
|
|
||||||
mkdir -p /tmp/aptss-conf/
|
mkdir -p /tmp/aptss-conf/
|
||||||
@@ -42,7 +70,7 @@ chmod -R 755 /tmp/aptss-conf
|
|||||||
sudo curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list"
|
sudo curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list"
|
||||||
### 额外一份拿来给aptss自动补全用
|
### 额外一份拿来给aptss自动补全用
|
||||||
sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
|
sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
|
||||||
sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="-" -o Dir::Cache="/etc/aptss/" -o APT::Get::List-Cleanup="0"
|
|
||||||
#只更新星火源
|
#只更新星火源
|
||||||
|
|
||||||
elif [ "$1" = "update" ];then
|
elif [ "$1" = "update" ];then
|
||||||
|
|||||||
2
tool/ss-feedback/README.md
Normal file
2
tool/ss-feedback/README.md
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
# Feadback 反馈脚本
|
||||||
|
使用 shc 加密, 需要使用 cc、gcc 编译。
|
||||||
817
tool/ss-feedback/sender-d.sh.c
Normal file
817
tool/ss-feedback/sender-d.sh.c
Normal file
@@ -0,0 +1,817 @@
|
|||||||
|
#if 0
|
||||||
|
shc Version 4.0.3, Generic Shell Script Compiler
|
||||||
|
GNU GPL Version 3 Md Jahidul Hamid <jahidulhamid@yahoo.com>
|
||||||
|
|
||||||
|
shc -v -r -f sender-d.sh
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static char data [] =
|
||||||
|
#define pswd_z 256
|
||||||
|
#define pswd ((&data[15]))
|
||||||
|
"\073\237\114\151\003\324\064\061\057\100\342\310\062\343\346\075"
|
||||||
|
"\105\011\036\257\154\107\223\050\237\060\137\020\063\015\377\156"
|
||||||
|
"\162\230\321\117\026\333\267\322\335\062\077\075\261\355\172\366"
|
||||||
|
"\367\231\246\144\341\071\215\201\151\354\221\234\371\221\013\153"
|
||||||
|
"\052\334\273\101\267\162\023\224\244\123\322\125\100\115\114\067"
|
||||||
|
"\347\362\233\310\053\050\111\225\025\333\061\016\154\075\172\227"
|
||||||
|
"\031\065\330\320\250\354\145\114\077\067\242\200\204\357\267\154"
|
||||||
|
"\341\123\064\015\174\176\242\221\131\324\240\306\021\032\136\053"
|
||||||
|
"\117\066\373\367\043\141\104\142\230\347\342\035\326\232\212\270"
|
||||||
|
"\356\276\306\152\075\151\374\227\076\234\135\120\266\273\173\006"
|
||||||
|
"\362\167\376\025\330\103\170\161\052\133\217\001\366\031\272\344"
|
||||||
|
"\330\201\116\025\352\113\254\051\347\012\171\236\305\365\245\270"
|
||||||
|
"\154\243\316\105\346\106\267\021\242\106\023\230\137\316\174\067"
|
||||||
|
"\117\313\115\072\026\371\143\376\003\334\234\311\322\101\202\076"
|
||||||
|
"\345\120\204\313\227\073\335\071\202\360\321\341\276\116\031\016"
|
||||||
|
"\031\146\110\057\140\253\056\144\210\312\056\132\014\260\231\361"
|
||||||
|
"\000\036\275\230\131\232\321\333\213\243\275\112\361\327\130\360"
|
||||||
|
"\173\100\213\115\034\027\361\331\141\342\261\272\356\360\133\051"
|
||||||
|
"\217\247\222\222\173\307\304\253\007\247\163\072\212\132\052\005"
|
||||||
|
"\232\266\123\266\315\104\220"
|
||||||
|
#define date_z 1
|
||||||
|
#define date ((&data[311]))
|
||||||
|
"\375"
|
||||||
|
#define tst2_z 19
|
||||||
|
#define tst2 ((&data[312]))
|
||||||
|
"\031\242\273\246\041\336\076\145\246\300\036\051\047\366\106\356"
|
||||||
|
"\220\064\226"
|
||||||
|
#define shll_z 10
|
||||||
|
#define shll ((&data[331]))
|
||||||
|
"\142\312\022\213\061\052\357\062\161\266\353\321"
|
||||||
|
#define inlo_z 3
|
||||||
|
#define inlo ((&data[343]))
|
||||||
|
"\216\314\250"
|
||||||
|
#define msg1_z 65
|
||||||
|
#define msg1 ((&data[347]))
|
||||||
|
"\300\115\164\240\306\270\356\211\346\362\207\042\205\377\337\231"
|
||||||
|
"\113\016\267\021\330\324\374\242\242\336\361\041\143\054\223\355"
|
||||||
|
"\361\326\220\125\016\336\260\031\012\341\025\102\124\131\005\244"
|
||||||
|
"\234\133\315\262\013\375\340\025\227\352\060\034\236\222\347\136"
|
||||||
|
"\160\356\206\333\112\340\006\120\173\274\243\061"
|
||||||
|
#define chk1_z 22
|
||||||
|
#define chk1 ((&data[427]))
|
||||||
|
"\270\017\004\242\044\277\223\036\316\135\273\047\172\354\056\123"
|
||||||
|
"\141\200\041\375\363\101\127\122\242\373\336\067\346\143\370"
|
||||||
|
#define text_z 1869
|
||||||
|
#define text ((&data[549]))
|
||||||
|
"\071\315\146\114\156\047\322\111\162\262\117\303\055\014\146\137"
|
||||||
|
"\226\117\042\116\136\046\360\203\135\327\346\126\251\033\243\342"
|
||||||
|
"\351\012\056\127\062\000\240\244\263\360\147\341\374\316\101\222"
|
||||||
|
"\035\143\341\174\212\322\377\350\251\345\076\122\001\342\065\352"
|
||||||
|
"\355\143\101\037\144\342\304\030\323\053\372\320\372\073\142\030"
|
||||||
|
"\237\104\224\051\026\223\022\300\171\121\023\172\064\110\144\041"
|
||||||
|
"\131\377\367\164\123\316\261\141\353\367\301\016\274\016\120\047"
|
||||||
|
"\114\046\100\031\034\140\073\010\260\305\236\267\340\334\172\305"
|
||||||
|
"\021\246\221\332\021\311\021\154\112\347\316\242\317\135\332\301"
|
||||||
|
"\336\151\126\072\217\354\230\133\220\107\301\140\001\353\360\166"
|
||||||
|
"\213\363\372\027\233\047\323\276\201\201\216\023\154\320\161\313"
|
||||||
|
"\320\152\257\025\322\272\025\153\247\235\321\160\071\321\067\253"
|
||||||
|
"\241\156\046\022\220\271\031\066\331\215\206\354\323\250\277\275"
|
||||||
|
"\253\021\137\373\037\247\054\101\371\345\374\104\113\056\231\313"
|
||||||
|
"\256\361\253\230\051\271\176\340\337\333\050\341\362\056\167\255"
|
||||||
|
"\110\043\213\146\047\300\122\142\314\236\021\040\074\377\243\374"
|
||||||
|
"\373\242\311\017\027\025\325\213\232\031\105\104\013\052\212\072"
|
||||||
|
"\030\104\271\142\045\220\026\110\122\375\151\376\117\030\367\246"
|
||||||
|
"\217\256\245\325\077\346\276\327\045\113\166\374\164\175\046\022"
|
||||||
|
"\327\265\135\221\047\346\332\276\260\240\227\230\211\165\023\170"
|
||||||
|
"\316\154\240\317\001\217\073\173\212\106\115\070\141\315\324\116"
|
||||||
|
"\204\026\326\026\254\252\257\044\333\310\024\223\327\026\336\312"
|
||||||
|
"\151\363\273\204\220\242\016\226\317\314\156\124\240\122\232\124"
|
||||||
|
"\110\055\240\223\016\373\000\136\102\135\122\057\222\070\210\130"
|
||||||
|
"\012\234\324\361\047\201\232\126\155\021\270\134\303\377\110\250"
|
||||||
|
"\220\352\314\011\276\260\131\175\233\367\254\266\366\263\014\102"
|
||||||
|
"\237\066\305\270\257\117\034\316\147\136\133\373\051\333\006\077"
|
||||||
|
"\242\225\073\276\155\106\311\232\247\112\341\143\016\103\013\062"
|
||||||
|
"\214\247\315\302\241\024\076\037\135\126\145\227\342\323\061\230"
|
||||||
|
"\016\246\203\251\033\223\105\251\131\001\060\306\305\034\005\133"
|
||||||
|
"\161\366\173\132\343\314\135\205\273\260\170\145\370\262\153\321"
|
||||||
|
"\253\345\131\260\346\020\367\016\127\056\307\040\112\052\012\264"
|
||||||
|
"\247\057\273\157\016\275\270\226\173\033\071\042\072\142\170\134"
|
||||||
|
"\045\016\163\251\362\073\214\166\354\103\017\330\122\073\211\204"
|
||||||
|
"\200\004\003\176\324\343\275\017\056\341\055\071\173\175\144\147"
|
||||||
|
"\365\115\274\012\253\277\036\370\220\115\307\120\131\037\206\063"
|
||||||
|
"\355\032\324\265\064\114\014\217\113\302\125\301\033\100\357\042"
|
||||||
|
"\334\212\202\353\262\040\130\240\027\110\343\271\356\171\001\325"
|
||||||
|
"\167\062\056\061\210\316\075\142\261\005\116\142\230\367\343\135"
|
||||||
|
"\174\302\375\047\075\334\222\326\253\073\174\173\360\260\021\344"
|
||||||
|
"\331\315\146\233\057\007\314\231\256\113\221\021\126\173\045\315"
|
||||||
|
"\247\126\162\253\375\041\043\263\232\274\171\132\320\020\070\152"
|
||||||
|
"\013\224\371\045\350\270\077\251\145\063\357\171\036\245\125\315"
|
||||||
|
"\020\206\333\111\062\331\054\144\346\173\132\113\374\043\022\371"
|
||||||
|
"\311\101\043\300\337\334\367\145\030\023\207\043\253\042\227\302"
|
||||||
|
"\350\037\067\332\350\253\117\124\243\341\046\211\061\007\303\154"
|
||||||
|
"\022\210\064\112\311\170\123\071\332\266\205\151\265\300\343\237"
|
||||||
|
"\147\001\024\013\173\265\330\375\070\111\044\246\204\155\146\067"
|
||||||
|
"\036\060\065\251\005\354\200\115\136\076\034\040\335\033\043\221"
|
||||||
|
"\374\211\170\061\251\321\372\116\023\167\330\007\310\060\175\076"
|
||||||
|
"\064\242\253\131\116\074\275\022\133\016\203\214\254\115\002\325"
|
||||||
|
"\046\213\073\107\241\341\273\110\300\236\005\231\275\325\012\175"
|
||||||
|
"\365\056\370\275\132\330\041\035\166\130\240\013\162\041\163\140"
|
||||||
|
"\377\225\075\315\115\106\270\277\233\113\106\305\270\240\026\106"
|
||||||
|
"\317\325\264\324\126\337\214\155\366\331\372\200\306\272\163\333"
|
||||||
|
"\266\343\246\100\016\002\242\070\231\262\005\137\323\257\343\047"
|
||||||
|
"\301\206\266\341\302\046\266\167\227\276\125\165\027\044\353\035"
|
||||||
|
"\043\036\300\137\140\244\156\205\364\361\067\016\324\110\142\167"
|
||||||
|
"\125\216\360\003\023\161\060\263\356\073\050\173\151\371\005\027"
|
||||||
|
"\027\273\363\163\017\044\064\055\267\345\052\320\370\132\374\123"
|
||||||
|
"\020\263\163\176\037\145\346\003\275\377\154\040\166\363\224\240"
|
||||||
|
"\214\304\332\367\057\146\070\165\101\026\125\361\100\357\001\031"
|
||||||
|
"\305\363\242\164\125\067\077\063\134\271\250\242\243\022\031\114"
|
||||||
|
"\225\006\352\203\137\376\201\147\225\372\053\217\331\003\156\143"
|
||||||
|
"\332\361\315\167\027\232\307\331\314\071\025\271\047\031\126\310"
|
||||||
|
"\254\200\324\257\022\351\244\007\335\036\150\036\362\072\021\007"
|
||||||
|
"\140\155\073\242\063\071\162\205\121\257\302\056\155\071\306\057"
|
||||||
|
"\236\364\027\143\074\375\254\324\117\176\242\267\247\215\374\137"
|
||||||
|
"\003\123\113\247\064\347\123\321\123\044\211\351\253\045\226\324"
|
||||||
|
"\034\147\117\066\000\370\074\041\242\137\270\361\106\154\113\045"
|
||||||
|
"\275\172\101\331\157\137\222\202\136\241\075\132\267\033\325\113"
|
||||||
|
"\042\352\305\133\274\252\111\213\330\215\261\145\322\246\174\031"
|
||||||
|
"\267\347\275\247\251\030\255\106\116\362\117\277\024\135\356\172"
|
||||||
|
"\033\066\346\252\205\144\302\147\131\076\122\021\152\225\313\235"
|
||||||
|
"\202\066\043\300\027\147\263\001\201\341\121\051\310\140\317\333"
|
||||||
|
"\131\254\112\104\337\014\320\143\375\231\252\220\064\143\234\000"
|
||||||
|
"\017\304\317\113\131\055\324\177\367\224\230\264\132\311\261\152"
|
||||||
|
"\034\137\223\225\365\314\014\076\377\025\023\040\222\043\022\047"
|
||||||
|
"\332\363\144\102\015\314\010\256\206\065\310\103\337\001\326\206"
|
||||||
|
"\024\354\074\045\337\107\003\225\137\032\055\332\056\347\073\055"
|
||||||
|
"\267\115\315\204\061\310\304\007\065\267\107\176\066\216\011\014"
|
||||||
|
"\066\215\236\247\176\327\164\113\353\215\343\313\302\106\302\250"
|
||||||
|
"\077\220\165\207\015\144\336\311\065\351\311\163\104\104\267\262"
|
||||||
|
"\307\057\106\061\110\271\053\136\133\263\066\177\103\212\234\166"
|
||||||
|
"\271\130\043\076\352\006\066\017\220\207\275\024\235\356\377\344"
|
||||||
|
"\005\257\200\002\253\123\052\015\326\342\225\116\137\256\213\354"
|
||||||
|
"\251\026\237\347\166\014\121\075\306\022\247\276\265\017\375\161"
|
||||||
|
"\174\113\273\017\227\064\057\217\376\326\311\140\354\074\160\121"
|
||||||
|
"\346\370\327\255\277\376\062\301\033\111\042\016\233\162\101\303"
|
||||||
|
"\161\123\210\042\157\270\114\252\372\315\352\335\221\115\300\252"
|
||||||
|
"\163\344\140\324\157\261\256\232\173\171\024\250\006\342\320\340"
|
||||||
|
"\365\137\167\336\216\320\337\345\265\346\363\133\023\076\121\117"
|
||||||
|
"\002\021\237\112\206\043\012\370\033\045\133\151\303\330\001\222"
|
||||||
|
"\073\174\074\320\054\005\127\000\210\240\347\131\256\126\253\007"
|
||||||
|
"\342\137\135\162\075\344\340\210\333\057\141\042\223\055\006\174"
|
||||||
|
"\000\005\225\117\203\320\143\136\130\037\333\217\136\371\221\220"
|
||||||
|
"\052\071\173\374\261\213\235\241\071\260\057\226\360\212\211\346"
|
||||||
|
"\333\062\135\157\357\316\156\022\111\201\010\151\065\111\364\364"
|
||||||
|
"\137\005\161\265\354\014\003\204\117\112\075\042\357\165\042\354"
|
||||||
|
"\263\304\343\323\045\127\244\326\160\216\335\042\353\173\135\061"
|
||||||
|
"\354\306\013\252\265\013\046\173\100\050\146\372\303\210\171\200"
|
||||||
|
"\160\377\013\300\245\265\307\146\355\047\052\007\011\214\060\367"
|
||||||
|
"\177\327\043\302\111\263\123\276\107\220\316\207\024\142\070\325"
|
||||||
|
"\004\262\276\355\075\175\146\163\370\345\135\214\322\041\105\047"
|
||||||
|
"\371\073\016\023\064\231\203\005\246\204\203\306\340\002\160\365"
|
||||||
|
"\315\022\302\170\340\356\151\323\344\242\134\046\134\162\227\117"
|
||||||
|
"\262\240\062\234\324\135\326\242\341\066\232\314\200\331\124\077"
|
||||||
|
"\201\245\227\252\073\356\252\367\277\232\331\005\324\350\032\261"
|
||||||
|
"\035\246\325\177\334\121\146\316\041\043\352\253\373\043\035\234"
|
||||||
|
"\231\321\046\171\221\105\216\272\025\321\042\222\007\351\363\232"
|
||||||
|
"\006\016\231\137\124\215\132\071\166\042\065\127\337\253\307\021"
|
||||||
|
"\337\364\070\261\112\201\310\242\335\104\353\055\277\322\232\240"
|
||||||
|
"\007\374\034\322\312\373\031\130\204\036\362\373\142\043\273\315"
|
||||||
|
"\216\373\273\260\310\111\070\031\207\101\325\157\110\142\216\357"
|
||||||
|
"\172\023\345\067\105\007\375\023\053\256\121\163\255\323\257\132"
|
||||||
|
"\164\360\307\234\106\130\275\217\211\327\300\322\261\206\364\326"
|
||||||
|
"\021\255\077\302\202\027\207\370\263\313\333\070\010\115\377\271"
|
||||||
|
"\173\302\243\224\126\201\255\356\261\176\213\135\216\054\237\371"
|
||||||
|
"\040\174\342\367\323\053\341\031\333\211\214\042\343\254\122\252"
|
||||||
|
"\325\326\263\326\325\063\065\362\114\161\314\151\116\237\160\073"
|
||||||
|
"\321\025\336\117\020\055\371\021\371\104\001\072\204\064\227\333"
|
||||||
|
"\034\374\123\265\343\026\372\207\264\033\065\316\147\211\142\366"
|
||||||
|
"\371\257\120\162\107\234\134\010\035\212\241\132\317\254\246\101"
|
||||||
|
"\020\211\005\051\134\061\043\054\054\137\217\104\376\323\330\050"
|
||||||
|
"\352\154\072\253\345\214\276\137\300\006\304\341\262\152\043\303"
|
||||||
|
"\364\051\354\120\132\017\175\207\156\014\313\155\337\244\225\312"
|
||||||
|
"\020\320\165\366\134\063\126\034\072\032\376\355\205\041\260\171"
|
||||||
|
"\113\234\312\245\254\107\055\033\123\370\210\063\235\036\375\256"
|
||||||
|
"\356\163\245\113\247\373\150\341\025\146\316\233\210\177\024\323"
|
||||||
|
"\034\336\171\310\046\246\343\171\237\153\255\075\211\252\353\170"
|
||||||
|
"\036\220\304\305\214\054\246\242\222\165\075\033\365\122\357\021"
|
||||||
|
"\061\150\331\127\017\275\321\257\051\176"
|
||||||
|
#define chk2_z 19
|
||||||
|
#define chk2 ((&data[2562]))
|
||||||
|
"\330\053\107\261\150\156\021\060\277\165\015\167\176\171\251\302"
|
||||||
|
"\276\160\207\325\012\334"
|
||||||
|
#define lsto_z 1
|
||||||
|
#define lsto ((&data[2581]))
|
||||||
|
"\010"
|
||||||
|
#define xecc_z 15
|
||||||
|
#define xecc ((&data[2582]))
|
||||||
|
"\005\040\327\254\114\361\156\300\024\244\110\337\050\143\126\227"
|
||||||
|
"\257"
|
||||||
|
#define tst1_z 22
|
||||||
|
#define tst1 ((&data[2603]))
|
||||||
|
"\036\047\271\057\207\076\001\326\201\264\356\151\036\164\071\111"
|
||||||
|
"\027\304\031\244\017\252\223\354\153\051\130\042\011\260"
|
||||||
|
#define msg2_z 19
|
||||||
|
#define msg2 ((&data[2632]))
|
||||||
|
"\341\357\377\335\143\002\251\076\361\005\267\075\204\313\320\034"
|
||||||
|
"\012\023\243\361\261\374\315\242"
|
||||||
|
#define rlax_z 1
|
||||||
|
#define rlax ((&data[2653]))
|
||||||
|
"\121"
|
||||||
|
#define opts_z 1
|
||||||
|
#define opts ((&data[2654]))
|
||||||
|
"\241"/* End of data[] */;
|
||||||
|
#define hide_z 4096
|
||||||
|
#define SETUID 0 /* Define as 1 to call setuid(0) at start of script */
|
||||||
|
#define DEBUGEXEC 0 /* Define as 1 to debug execvp calls */
|
||||||
|
#define TRACEABLE 1 /* Define as 1 to enable ptrace the executable */
|
||||||
|
#define HARDENING 0 /* Define as 1 to disable ptrace/dump the executable */
|
||||||
|
#define BUSYBOXON 0 /* Define as 1 to enable work with busybox */
|
||||||
|
|
||||||
|
#if HARDENING
|
||||||
|
static const char * shc_x[] = {
|
||||||
|
"/*",
|
||||||
|
" * Copyright 2019 - Intika <intika@librefox.org>",
|
||||||
|
" * Replace ******** with secret read from fd 21",
|
||||||
|
" * Also change arguments location of sub commands (sh script commands)",
|
||||||
|
" * gcc -Wall -fpic -shared -o shc_secret.so shc_secret.c -ldl",
|
||||||
|
" */",
|
||||||
|
"",
|
||||||
|
"#define _GNU_SOURCE /* needed to get RTLD_NEXT defined in dlfcn.h */",
|
||||||
|
"#define PLACEHOLDER \"********\"",
|
||||||
|
"#include <dlfcn.h>",
|
||||||
|
"#include <stdlib.h>",
|
||||||
|
"#include <string.h>",
|
||||||
|
"#include <unistd.h>",
|
||||||
|
"#include <stdio.h>",
|
||||||
|
"#include <signal.h>",
|
||||||
|
"",
|
||||||
|
"static char secret[128000]; //max size",
|
||||||
|
"typedef int (*pfi)(int, char **, char **);",
|
||||||
|
"static pfi real_main;",
|
||||||
|
"",
|
||||||
|
"// copy argv to new location",
|
||||||
|
"char **copyargs(int argc, char** argv){",
|
||||||
|
" char **newargv = malloc((argc+1)*sizeof(*argv));",
|
||||||
|
" char *from,*to;",
|
||||||
|
" int i,len;",
|
||||||
|
"",
|
||||||
|
" for(i = 0; i<argc; i++){",
|
||||||
|
" from = argv[i];",
|
||||||
|
" len = strlen(from)+1;",
|
||||||
|
" to = malloc(len);",
|
||||||
|
" memcpy(to,from,len);",
|
||||||
|
" // zap old argv space",
|
||||||
|
" memset(from,'\\0',len);",
|
||||||
|
" newargv[i] = to;",
|
||||||
|
" argv[i] = 0;",
|
||||||
|
" }",
|
||||||
|
" newargv[argc] = 0;",
|
||||||
|
" return newargv;",
|
||||||
|
"}",
|
||||||
|
"",
|
||||||
|
"static int mymain(int argc, char** argv, char** env) {",
|
||||||
|
" //fprintf(stderr, \"Inject main argc = %d\\n\", argc);",
|
||||||
|
" return real_main(argc, copyargs(argc,argv), env);",
|
||||||
|
"}",
|
||||||
|
"",
|
||||||
|
"int __libc_start_main(int (*main) (int, char**, char**),",
|
||||||
|
" int argc,",
|
||||||
|
" char **argv,",
|
||||||
|
" void (*init) (void),",
|
||||||
|
" void (*fini)(void),",
|
||||||
|
" void (*rtld_fini)(void),",
|
||||||
|
" void (*stack_end)){",
|
||||||
|
" static int (*real___libc_start_main)() = NULL;",
|
||||||
|
" int n;",
|
||||||
|
"",
|
||||||
|
" if (!real___libc_start_main) {",
|
||||||
|
" real___libc_start_main = dlsym(RTLD_NEXT, \"__libc_start_main\");",
|
||||||
|
" if (!real___libc_start_main) abort();",
|
||||||
|
" }",
|
||||||
|
"",
|
||||||
|
" n = read(21, secret, sizeof(secret));",
|
||||||
|
" if (n > 0) {",
|
||||||
|
" int i;",
|
||||||
|
"",
|
||||||
|
" if (secret[n - 1] == '\\n') secret[--n] = '\\0';",
|
||||||
|
" for (i = 1; i < argc; i++)",
|
||||||
|
" if (strcmp(argv[i], PLACEHOLDER) == 0)",
|
||||||
|
" argv[i] = secret;",
|
||||||
|
" }",
|
||||||
|
"",
|
||||||
|
" real_main = main;",
|
||||||
|
"",
|
||||||
|
" return real___libc_start_main(mymain, argc, argv, init, fini, rtld_fini, stack_end);",
|
||||||
|
"}",
|
||||||
|
"",
|
||||||
|
0};
|
||||||
|
#endif /* HARDENING */
|
||||||
|
|
||||||
|
/* rtc.c */
|
||||||
|
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
|
||||||
|
#include <errno.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <time.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
/* 'Alleged RC4' */
|
||||||
|
|
||||||
|
static unsigned char stte[256], indx, jndx, kndx;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Reset arc4 stte.
|
||||||
|
*/
|
||||||
|
void stte_0(void)
|
||||||
|
{
|
||||||
|
indx = jndx = kndx = 0;
|
||||||
|
do {
|
||||||
|
stte[indx] = indx;
|
||||||
|
} while (++indx);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Set key. Can be used more than once.
|
||||||
|
*/
|
||||||
|
void key(void * str, int len)
|
||||||
|
{
|
||||||
|
unsigned char tmp, * ptr = (unsigned char *)str;
|
||||||
|
while (len > 0) {
|
||||||
|
do {
|
||||||
|
tmp = stte[indx];
|
||||||
|
kndx += tmp;
|
||||||
|
kndx += ptr[(int)indx % len];
|
||||||
|
stte[indx] = stte[kndx];
|
||||||
|
stte[kndx] = tmp;
|
||||||
|
} while (++indx);
|
||||||
|
ptr += 256;
|
||||||
|
len -= 256;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Crypt data.
|
||||||
|
*/
|
||||||
|
void arc4(void * str, int len)
|
||||||
|
{
|
||||||
|
unsigned char tmp, * ptr = (unsigned char *)str;
|
||||||
|
while (len > 0) {
|
||||||
|
indx++;
|
||||||
|
tmp = stte[indx];
|
||||||
|
jndx += tmp;
|
||||||
|
stte[indx] = stte[jndx];
|
||||||
|
stte[jndx] = tmp;
|
||||||
|
tmp += stte[indx];
|
||||||
|
*ptr ^= stte[tmp];
|
||||||
|
ptr++;
|
||||||
|
len--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* End of ARC4 */
|
||||||
|
|
||||||
|
#if HARDENING
|
||||||
|
|
||||||
|
#include <sys/ptrace.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <sys/prctl.h>
|
||||||
|
#define PR_SET_PTRACER 0x59616d61
|
||||||
|
|
||||||
|
/* Seccomp Sandboxing Init */
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <errno.h>
|
||||||
|
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/prctl.h>
|
||||||
|
#include <sys/syscall.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
|
||||||
|
#include <linux/filter.h>
|
||||||
|
#include <linux/seccomp.h>
|
||||||
|
#include <linux/audit.h>
|
||||||
|
|
||||||
|
#define ArchField offsetof(struct seccomp_data, arch)
|
||||||
|
|
||||||
|
#define Allow(syscall) \
|
||||||
|
BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, SYS_##syscall, 0, 1), \
|
||||||
|
BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
|
||||||
|
|
||||||
|
struct sock_filter filter[] = {
|
||||||
|
/* validate arch */
|
||||||
|
BPF_STMT(BPF_LD+BPF_W+BPF_ABS, ArchField),
|
||||||
|
BPF_JUMP( BPF_JMP+BPF_JEQ+BPF_K, AUDIT_ARCH_X86_64, 1, 0),
|
||||||
|
BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_KILL),
|
||||||
|
|
||||||
|
/* load syscall */
|
||||||
|
BPF_STMT(BPF_LD+BPF_W+BPF_ABS, offsetof(struct seccomp_data, nr)),
|
||||||
|
|
||||||
|
/* list of allowed syscalls */
|
||||||
|
Allow(exit_group), /* exits a process */
|
||||||
|
Allow(brk), /* for malloc(), inside libc */
|
||||||
|
Allow(mmap), /* also for malloc() */
|
||||||
|
Allow(munmap), /* for free(), inside libc */
|
||||||
|
|
||||||
|
/* and if we don't match above, die */
|
||||||
|
BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_KILL),
|
||||||
|
};
|
||||||
|
struct sock_fprog filterprog = {
|
||||||
|
.len = sizeof(filter)/sizeof(filter[0]),
|
||||||
|
.filter = filter
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Seccomp Sandboxing - Set up the restricted environment */
|
||||||
|
void seccomp_hardening() {
|
||||||
|
if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)) {
|
||||||
|
perror("Could not start seccomp:");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
if (prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &filterprog) == -1) {
|
||||||
|
perror("Could not start seccomp:");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* End Seccomp Sandboxing Init */
|
||||||
|
|
||||||
|
void shc_x_file() {
|
||||||
|
FILE *fp;
|
||||||
|
int line = 0;
|
||||||
|
|
||||||
|
if ((fp = fopen("/tmp/shc_x.c", "w")) == NULL ) {exit(1); exit(1);}
|
||||||
|
for (line = 0; shc_x[line]; line++) fprintf(fp, "%s\n", shc_x[line]);
|
||||||
|
fflush(fp);fclose(fp);
|
||||||
|
}
|
||||||
|
|
||||||
|
int make() {
|
||||||
|
char * cc, * cflags, * ldflags;
|
||||||
|
char cmd[4096];
|
||||||
|
|
||||||
|
cc = getenv("CC");
|
||||||
|
if (!cc) cc = "cc";
|
||||||
|
|
||||||
|
sprintf(cmd, "%s %s -o %s %s", cc, "-Wall -fpic -shared", "/tmp/shc_x.so", "/tmp/shc_x.c -ldl");
|
||||||
|
if (system(cmd)) {remove("/tmp/shc_x.c"); return -1;}
|
||||||
|
remove("/tmp/shc_x.c"); return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void arc4_hardrun(void * str, int len) {
|
||||||
|
//Decode locally
|
||||||
|
char tmp2[len];
|
||||||
|
char tmp3[len+1024];
|
||||||
|
memcpy(tmp2, str, len);
|
||||||
|
|
||||||
|
unsigned char tmp, * ptr = (unsigned char *)tmp2;
|
||||||
|
int lentmp = len;
|
||||||
|
int pid, status;
|
||||||
|
pid = fork();
|
||||||
|
|
||||||
|
shc_x_file();
|
||||||
|
if (make()) {exit(1);}
|
||||||
|
|
||||||
|
setenv("LD_PRELOAD","/tmp/shc_x.so",1);
|
||||||
|
|
||||||
|
if(pid==0) {
|
||||||
|
|
||||||
|
//Start tracing to protect from dump & trace
|
||||||
|
if (ptrace(PTRACE_TRACEME, 0, 0, 0) < 0) {
|
||||||
|
kill(getpid(), SIGKILL);
|
||||||
|
_exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
//Decode Bash
|
||||||
|
while (len > 0) {
|
||||||
|
indx++;
|
||||||
|
tmp = stte[indx];
|
||||||
|
jndx += tmp;
|
||||||
|
stte[indx] = stte[jndx];
|
||||||
|
stte[jndx] = tmp;
|
||||||
|
tmp += stte[indx];
|
||||||
|
*ptr ^= stte[tmp];
|
||||||
|
ptr++;
|
||||||
|
len--;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Do the magic
|
||||||
|
sprintf(tmp3, "%s %s", "'********' 21<<<", tmp2);
|
||||||
|
|
||||||
|
//Exec bash script //fork execl with 'sh -c'
|
||||||
|
system(tmp2);
|
||||||
|
|
||||||
|
//Empty script variable
|
||||||
|
memcpy(tmp2, str, lentmp);
|
||||||
|
|
||||||
|
//Clean temp
|
||||||
|
remove("/tmp/shc_x.so");
|
||||||
|
|
||||||
|
//Sinal to detach ptrace
|
||||||
|
ptrace(PTRACE_DETACH, 0, 0, 0);
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
else {wait(&status);}
|
||||||
|
|
||||||
|
/* Seccomp Sandboxing - Start */
|
||||||
|
seccomp_hardening();
|
||||||
|
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
#endif /* HARDENING */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Key with file invariants.
|
||||||
|
*/
|
||||||
|
int key_with_file(char * file)
|
||||||
|
{
|
||||||
|
struct stat statf[1];
|
||||||
|
struct stat control[1];
|
||||||
|
|
||||||
|
if (stat(file, statf) < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
/* Turn on stable fields */
|
||||||
|
memset(control, 0, sizeof(control));
|
||||||
|
control->st_ino = statf->st_ino;
|
||||||
|
control->st_dev = statf->st_dev;
|
||||||
|
control->st_rdev = statf->st_rdev;
|
||||||
|
control->st_uid = statf->st_uid;
|
||||||
|
control->st_gid = statf->st_gid;
|
||||||
|
control->st_size = statf->st_size;
|
||||||
|
control->st_mtime = statf->st_mtime;
|
||||||
|
control->st_ctime = statf->st_ctime;
|
||||||
|
key(control, sizeof(control));
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#if DEBUGEXEC
|
||||||
|
void debugexec(char * sh11, int argc, char ** argv)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
fprintf(stderr, "shll=%s\n", sh11 ? sh11 : "<null>");
|
||||||
|
fprintf(stderr, "argc=%d\n", argc);
|
||||||
|
if (!argv) {
|
||||||
|
fprintf(stderr, "argv=<null>\n");
|
||||||
|
} else {
|
||||||
|
for (i = 0; i <= argc ; i++)
|
||||||
|
fprintf(stderr, "argv[%d]=%.60s\n", i, argv[i] ? argv[i] : "<null>");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif /* DEBUGEXEC */
|
||||||
|
|
||||||
|
void rmarg(char ** argv, char * arg)
|
||||||
|
{
|
||||||
|
for (; argv && *argv && *argv != arg; argv++);
|
||||||
|
for (; argv && *argv; argv++)
|
||||||
|
*argv = argv[1];
|
||||||
|
}
|
||||||
|
|
||||||
|
void chkenv_end(void);
|
||||||
|
|
||||||
|
int chkenv(int argc)
|
||||||
|
{
|
||||||
|
char buff[512];
|
||||||
|
unsigned long mask, m;
|
||||||
|
int l, a, c;
|
||||||
|
char * string;
|
||||||
|
extern char ** environ;
|
||||||
|
|
||||||
|
mask = (unsigned long)getpid();
|
||||||
|
stte_0();
|
||||||
|
key(&chkenv, (void*)&chkenv_end - (void*)&chkenv);
|
||||||
|
key(&data, sizeof(data));
|
||||||
|
key(&mask, sizeof(mask));
|
||||||
|
arc4(&mask, sizeof(mask));
|
||||||
|
sprintf(buff, "x%lx", mask);
|
||||||
|
string = getenv(buff);
|
||||||
|
#if DEBUGEXEC
|
||||||
|
fprintf(stderr, "getenv(%s)=%s\n", buff, string ? string : "<null>");
|
||||||
|
#endif
|
||||||
|
l = strlen(buff);
|
||||||
|
if (!string) {
|
||||||
|
/* 1st */
|
||||||
|
sprintf(&buff[l], "=%lu %d", mask, argc);
|
||||||
|
putenv(strdup(buff));
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
c = sscanf(string, "%lu %d%c", &m, &a, buff);
|
||||||
|
if (c == 2 && m == mask) {
|
||||||
|
/* 3rd */
|
||||||
|
rmarg(environ, &string[-l - 1]);
|
||||||
|
return 1 + (argc - a);
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
void chkenv_end(void){}
|
||||||
|
|
||||||
|
#if HARDENING
|
||||||
|
|
||||||
|
static void gets_process_name(const pid_t pid, char * name) {
|
||||||
|
char procfile[BUFSIZ];
|
||||||
|
sprintf(procfile, "/proc/%d/cmdline", pid);
|
||||||
|
FILE* f = fopen(procfile, "r");
|
||||||
|
if (f) {
|
||||||
|
size_t size;
|
||||||
|
size = fread(name, sizeof (char), sizeof (procfile), f);
|
||||||
|
if (size > 0) {
|
||||||
|
if ('\n' == name[size - 1])
|
||||||
|
name[size - 1] = '\0';
|
||||||
|
}
|
||||||
|
fclose(f);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void hardening() {
|
||||||
|
prctl(PR_SET_DUMPABLE, 0);
|
||||||
|
prctl(PR_SET_PTRACER, -1);
|
||||||
|
|
||||||
|
int pid = getppid();
|
||||||
|
char name[256] = {0};
|
||||||
|
gets_process_name(pid, name);
|
||||||
|
|
||||||
|
if ( (strcmp(name, "bash") != 0)
|
||||||
|
&& (strcmp(name, "/bin/bash") != 0)
|
||||||
|
&& (strcmp(name, "sh") != 0)
|
||||||
|
&& (strcmp(name, "/bin/sh") != 0)
|
||||||
|
&& (strcmp(name, "sudo") != 0)
|
||||||
|
&& (strcmp(name, "/bin/sudo") != 0)
|
||||||
|
&& (strcmp(name, "/usr/bin/sudo") != 0)
|
||||||
|
&& (strcmp(name, "gksudo") != 0)
|
||||||
|
&& (strcmp(name, "/bin/gksudo") != 0)
|
||||||
|
&& (strcmp(name, "/usr/bin/gksudo") != 0)
|
||||||
|
&& (strcmp(name, "kdesu") != 0)
|
||||||
|
&& (strcmp(name, "/bin/kdesu") != 0)
|
||||||
|
&& (strcmp(name, "/usr/bin/kdesu") != 0)
|
||||||
|
)
|
||||||
|
{
|
||||||
|
printf("Operation not permitted\n");
|
||||||
|
kill(getpid(), SIGKILL);
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* HARDENING */
|
||||||
|
|
||||||
|
#if !TRACEABLE
|
||||||
|
|
||||||
|
#define _LINUX_SOURCE_COMPAT
|
||||||
|
#include <sys/ptrace.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
#if !defined(PT_ATTACHEXC) /* New replacement for PT_ATTACH */
|
||||||
|
#if !defined(PTRACE_ATTACH) && defined(PT_ATTACH)
|
||||||
|
#define PT_ATTACHEXC PT_ATTACH
|
||||||
|
#elif defined(PTRACE_ATTACH)
|
||||||
|
#define PT_ATTACHEXC PTRACE_ATTACH
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void untraceable(char * argv0)
|
||||||
|
{
|
||||||
|
char proc[80];
|
||||||
|
int pid, mine;
|
||||||
|
|
||||||
|
switch(pid = fork()) {
|
||||||
|
case 0:
|
||||||
|
pid = getppid();
|
||||||
|
/* For problematic SunOS ptrace */
|
||||||
|
#if defined(__FreeBSD__)
|
||||||
|
sprintf(proc, "/proc/%d/mem", (int)pid);
|
||||||
|
#else
|
||||||
|
sprintf(proc, "/proc/%d/as", (int)pid);
|
||||||
|
#endif
|
||||||
|
close(0);
|
||||||
|
mine = !open(proc, O_RDWR|O_EXCL);
|
||||||
|
if (!mine && errno != EBUSY)
|
||||||
|
mine = !ptrace(PT_ATTACHEXC, pid, 0, 0);
|
||||||
|
if (mine) {
|
||||||
|
kill(pid, SIGCONT);
|
||||||
|
} else {
|
||||||
|
perror(argv0);
|
||||||
|
kill(pid, SIGKILL);
|
||||||
|
}
|
||||||
|
_exit(mine);
|
||||||
|
case -1:
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
if (pid == waitpid(pid, 0, 0))
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
perror(argv0);
|
||||||
|
_exit(1);
|
||||||
|
}
|
||||||
|
#endif /* !TRACEABLE */
|
||||||
|
|
||||||
|
char * xsh(int argc, char ** argv)
|
||||||
|
{
|
||||||
|
char * scrpt;
|
||||||
|
int ret, i, j;
|
||||||
|
char ** varg;
|
||||||
|
char * me = argv[0];
|
||||||
|
if (me == NULL) { me = getenv("_"); }
|
||||||
|
if (me == 0) { fprintf(stderr, "E: neither argv[0] nor $_ works."); exit(1); }
|
||||||
|
|
||||||
|
ret = chkenv(argc);
|
||||||
|
stte_0();
|
||||||
|
key(pswd, pswd_z);
|
||||||
|
arc4(msg1, msg1_z);
|
||||||
|
arc4(date, date_z);
|
||||||
|
if (date[0] && (atoll(date)<time(NULL)))
|
||||||
|
return msg1;
|
||||||
|
arc4(shll, shll_z);
|
||||||
|
arc4(inlo, inlo_z);
|
||||||
|
arc4(xecc, xecc_z);
|
||||||
|
arc4(lsto, lsto_z);
|
||||||
|
arc4(tst1, tst1_z);
|
||||||
|
key(tst1, tst1_z);
|
||||||
|
arc4(chk1, chk1_z);
|
||||||
|
if ((chk1_z != tst1_z) || memcmp(tst1, chk1, tst1_z))
|
||||||
|
return tst1;
|
||||||
|
arc4(msg2, msg2_z);
|
||||||
|
if (ret < 0)
|
||||||
|
return msg2;
|
||||||
|
varg = (char **)calloc(argc + 10, sizeof(char *));
|
||||||
|
if (!varg)
|
||||||
|
return 0;
|
||||||
|
if (ret) {
|
||||||
|
arc4(rlax, rlax_z);
|
||||||
|
if (!rlax[0] && key_with_file(shll))
|
||||||
|
return shll;
|
||||||
|
arc4(opts, opts_z);
|
||||||
|
#if HARDENING
|
||||||
|
arc4_hardrun(text, text_z);
|
||||||
|
exit(0);
|
||||||
|
/* Seccomp Sandboxing - Start */
|
||||||
|
seccomp_hardening();
|
||||||
|
#endif
|
||||||
|
arc4(text, text_z);
|
||||||
|
arc4(tst2, tst2_z);
|
||||||
|
key(tst2, tst2_z);
|
||||||
|
arc4(chk2, chk2_z);
|
||||||
|
if ((chk2_z != tst2_z) || memcmp(tst2, chk2, tst2_z))
|
||||||
|
return tst2;
|
||||||
|
/* Prepend hide_z spaces to script text to hide it. */
|
||||||
|
scrpt = malloc(hide_z + text_z);
|
||||||
|
if (!scrpt)
|
||||||
|
return 0;
|
||||||
|
memset(scrpt, (int) ' ', hide_z);
|
||||||
|
memcpy(&scrpt[hide_z], text, text_z);
|
||||||
|
} else { /* Reexecute */
|
||||||
|
if (*xecc) {
|
||||||
|
scrpt = malloc(512);
|
||||||
|
if (!scrpt)
|
||||||
|
return 0;
|
||||||
|
sprintf(scrpt, xecc, me);
|
||||||
|
} else {
|
||||||
|
scrpt = me;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
j = 0;
|
||||||
|
#if BUSYBOXON
|
||||||
|
varg[j++] = "busybox";
|
||||||
|
varg[j++] = "sh";
|
||||||
|
#else
|
||||||
|
varg[j++] = argv[0]; /* My own name at execution */
|
||||||
|
#endif
|
||||||
|
if (ret && *opts)
|
||||||
|
varg[j++] = opts; /* Options on 1st line of code */
|
||||||
|
if (*inlo)
|
||||||
|
varg[j++] = inlo; /* Option introducing inline code */
|
||||||
|
varg[j++] = scrpt; /* The script itself */
|
||||||
|
if (*lsto)
|
||||||
|
varg[j++] = lsto; /* Option meaning last option */
|
||||||
|
i = (ret > 1) ? ret : 0; /* Args numbering correction */
|
||||||
|
while (i < argc)
|
||||||
|
varg[j++] = argv[i++]; /* Main run-time arguments */
|
||||||
|
varg[j] = 0; /* NULL terminated array */
|
||||||
|
#if DEBUGEXEC
|
||||||
|
debugexec(shll, j, varg);
|
||||||
|
#endif
|
||||||
|
execvp(shll, varg);
|
||||||
|
return shll;
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(int argc, char ** argv)
|
||||||
|
{
|
||||||
|
#if SETUID
|
||||||
|
setuid(0);
|
||||||
|
#endif
|
||||||
|
#if DEBUGEXEC
|
||||||
|
debugexec("main", argc, argv);
|
||||||
|
#endif
|
||||||
|
#if HARDENING
|
||||||
|
hardening();
|
||||||
|
#endif
|
||||||
|
#if !TRACEABLE
|
||||||
|
untraceable(argv[0]);
|
||||||
|
#endif
|
||||||
|
argv[1] = xsh(argc, argv);
|
||||||
|
fprintf(stderr, "%s%s%s: %s\n", argv[0],
|
||||||
|
errno ? ": " : "",
|
||||||
|
errno ? strerror(errno) : "",
|
||||||
|
argv[1] ? argv[1] : "<null>"
|
||||||
|
);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
@@ -65,7 +65,7 @@ fi
|
|||||||
if [ "$DEPEND" != "" ] && [ "$isuos" = "" ]; then
|
if [ "$DEPEND" != "" ] && [ "$isuos" = "" ]; then
|
||||||
echo "检测到apt-fast,使用aptss进行多线程下载加速"
|
echo "检测到apt-fast,使用aptss进行多线程下载加速"
|
||||||
echo ----------------------------------------------------------------------------------
|
echo ----------------------------------------------------------------------------------
|
||||||
echo "$upass" | sudo -S dpkg -i $1 || sudo aptss ssupdate && sudo aptss install -yf
|
echo "$upass" | sudo -S dpkg -i $1 || sudo aptss install -yf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@@ -90,7 +90,7 @@ fi
|
|||||||
if [ "$DEPEND" != "" ] && [ "$isuos" = "" ]; then
|
if [ "$DEPEND" != "" ] && [ "$isuos" = "" ]; then
|
||||||
echo "检测到apt-fast,使用aptss进行多线程下载加速"
|
echo "检测到apt-fast,使用aptss进行多线程下载加速"
|
||||||
echo ----------------------------------------------------------------------------------
|
echo ----------------------------------------------------------------------------------
|
||||||
dpkg -i $1 || aptss ssupdate && aptss install -yf
|
dpkg -i $1 || aptss install -yf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ endloop=0
|
|||||||
#####################检测是否启动过了更新检测工具
|
#####################检测是否启动过了更新检测工具
|
||||||
while [ $endloop -eq 0 ] ;do
|
while [ $endloop -eq 0 ] ;do
|
||||||
|
|
||||||
if [ -f /etc/xdg/autostart/spark-update-notifier.desktop ];then
|
if [ -e /etc/systemd/system/multi-user.target.wants/spark-update-notifier.service ];then
|
||||||
text_update_open="关闭"
|
text_update_open="关闭"
|
||||||
#已经开启了就显示关闭
|
#已经开启了就显示关闭
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -48,11 +48,18 @@ fi
|
|||||||
|
|
||||||
curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list"
|
curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list"
|
||||||
# 每日更新星火源文件
|
# 每日更新星火源文件
|
||||||
|
mkdir -p /etc/apt/preferences.d
|
||||||
|
touch /etc/apt/preferences.d/sparkstore
|
||||||
|
cat << EOF >/etc/apt/preferences.d/sparkstore
|
||||||
|
Package: *
|
||||||
|
Pin: origin *.deepinos.org.cn
|
||||||
|
Pin-Priority: 100
|
||||||
|
|
||||||
|
EOF
|
||||||
|
|
||||||
updatetext=`aptss ssupdate`
|
updatetext=`aptss ssupdate`
|
||||||
|
|
||||||
|
rm /etc/apt/preferences.d/sparkstore
|
||||||
mkdir -p /tmp/spark-store-updatenum/
|
|
||||||
|
|
||||||
|
|
||||||
isupdate=`echo ${updatetext: -5}`
|
isupdate=`echo ${updatetext: -5}`
|
||||||
|
|||||||
@@ -45,47 +45,52 @@
|
|||||||
<context>
|
<context>
|
||||||
<name>SpkAppInfoLoaderThread</name>
|
<name>SpkAppInfoLoaderThread</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="167"/>
|
<location filename="../src/workerthreads.cpp" line="193"/>
|
||||||
<source>Failed to download app info. Please check internet connection.</source>
|
<source>Failed to download app info. Please check internet connection.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="48"/>
|
<location filename="../src/workerthreads.cpp" line="73"/>
|
||||||
<source>PkgName: </source>
|
<source>PkgName: </source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="49"/>
|
<location filename="../src/workerthreads.cpp" line="74"/>
|
||||||
<source>Version: </source>
|
<source>Version: </source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="52"/>
|
<location filename="../src/workerthreads.cpp" line="77"/>
|
||||||
<source>Author: </source>
|
<source>Author: </source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="57"/>
|
<location filename="../src/workerthreads.cpp" line="82"/>
|
||||||
<source>Official Site: </source>
|
<source>Official Site: </source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="61"/>
|
<location filename="../src/workerthreads.cpp" line="86"/>
|
||||||
<source>Contributor: </source>
|
<source>Contributor: </source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="62"/>
|
<location filename="../src/workerthreads.cpp" line="87"/>
|
||||||
<source>Update Time: </source>
|
<source>Update Time: </source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="63"/>
|
<location filename="../src/workerthreads.cpp" line="88"/>
|
||||||
<source>Installed Size: </source>
|
<source>Installed Size: </source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="123"/>
|
<location filename="../src/workerthreads.cpp" line="89"/>
|
||||||
|
<source>Download Times: </source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../src/workerthreads.cpp" line="149"/>
|
||||||
<source>Failed to load application icon.</source>
|
<source>Failed to load application icon.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
@@ -144,8 +149,8 @@
|
|||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.ui" line="547"/>
|
<location filename="../src/widget.ui" line="547"/>
|
||||||
<location filename="../src/widget.cpp" line="906"/>
|
<location filename="../src/widget.cpp" line="910"/>
|
||||||
<location filename="../src/widget.cpp" line="1175"/>
|
<location filename="../src/widget.cpp" line="1119"/>
|
||||||
<source>Install</source>
|
<source>Install</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
@@ -342,11 +347,6 @@
|
|||||||
<source>Refresh</source>
|
<source>Refresh</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
|
||||||
<location filename="../src/widget.ui" line="1223"/>
|
|
||||||
<source><html><head/><body><p>The role of the source server is to ensure that the software is updated, and supports the use of the apt tool to get the software. We usually prefer that you use the first line as the update source, which is generally the most stable. </p></body></html></source>
|
|
||||||
<translation type="unfinished"></translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.ui" line="1233"/>
|
<location filename="../src/widget.ui" line="1233"/>
|
||||||
<source>Update</source>
|
<source>Update</source>
|
||||||
@@ -354,7 +354,7 @@
|
|||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.ui" line="1240"/>
|
<location filename="../src/widget.ui" line="1240"/>
|
||||||
<source>Source Server</source>
|
<source>Spark Store Update</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
@@ -422,103 +422,98 @@
|
|||||||
<source>Take effect when restart</source>
|
<source>Take effect when restart</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../src/widget.ui" line="1223"/>
|
||||||
|
<source><html><head/><body><p>Check update for Spark Store. </p></body></html></source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.ui" line="1334"/>
|
<location filename="../src/widget.ui" line="1334"/>
|
||||||
<source>0B</source>
|
<source>0B</source>
|
||||||
<translation type="unfinished">0B</translation>
|
<translation type="unfinished">0B</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="186"/>
|
<location filename="../src/widget.cpp" line="187"/>
|
||||||
<source>Spark Store</source>
|
<source>Spark Store</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="187"/>
|
<location filename="../src/widget.cpp" line="188"/>
|
||||||
<source>Search or enter spk://</source>
|
<source>Search or enter spk://</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="193"/>
|
<location filename="../src/widget.cpp" line="194"/>
|
||||||
<source>Submit App</source>
|
<source>Submit App</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="194"/>
|
<location filename="../src/widget.cpp" line="195"/>
|
||||||
<source>Settings</source>
|
<source>Settings</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="195"/>
|
<location filename="../src/widget.cpp" line="196"/>
|
||||||
<source>APP Upgrade and Install Settings</source>
|
<source>APP Upgrade and Install Settings</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="344"/>
|
<location filename="../src/widget.cpp" line="347"/>
|
||||||
<source>Not Exist</source>
|
<source>Not Exist</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="138"/>
|
<location filename="../src/widget.cpp" line="139"/>
|
||||||
<location filename="../src/widget.cpp" line="406"/>
|
<location filename="../src/widget.cpp" line="409"/>
|
||||||
<location filename="../src/widget.cpp" line="411"/>
|
<location filename="../src/widget.cpp" line="414"/>
|
||||||
<location filename="../src/widget.cpp" line="421"/>
|
<location filename="../src/widget.cpp" line="424"/>
|
||||||
<location filename="../src/widget.cpp" line="426"/>
|
<location filename="../src/widget.cpp" line="429"/>
|
||||||
<source>Spark\ Store</source>
|
<source>Spark\ Store</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="656"/>
|
<location filename="../src/widget.cpp" line="659"/>
|
||||||
<location filename="../src/widget.cpp" line="895"/>
|
<location filename="../src/widget.cpp" line="899"/>
|
||||||
<source>Reinstall</source>
|
<source>Reinstall</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="622"/>
|
<location filename="../src/widget.cpp" line="625"/>
|
||||||
<source>Failed to get the name to the file to be downloaded.</source>
|
<source>Failed to get the name to the file to be downloaded.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="900"/>
|
<location filename="../src/widget.cpp" line="904"/>
|
||||||
<source>Upgrade</source>
|
<source>Upgrade</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="1083"/>
|
<location filename="../src/widget.cpp" line="1091"/>
|
||||||
<source>Updating, please wait...</source>
|
<source>Updating, please wait...</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="1144"/>
|
<location filename="../src/widget.cpp" line="1123"/>
|
||||||
<source>Apt has reported an error. Please use apt update in terminal to locate the problem.</source>
|
|
||||||
<translation type="unfinished"></translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<location filename="../src/widget.cpp" line="1151"/>
|
|
||||||
<source>Unknown error!</source>
|
|
||||||
<translation type="unfinished"></translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<location filename="../src/widget.cpp" line="1179"/>
|
|
||||||
<source>Uninstall succeeded</source>
|
<source>Uninstall succeeded</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="706"/>
|
<location filename="../src/widget.cpp" line="710"/>
|
||||||
<source>Relative apps Not Found!</source>
|
<source>Relative apps Not Found!</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="715"/>
|
<location filename="../src/widget.cpp" line="719"/>
|
||||||
<source>Request Error: %1</source>
|
<source>Request Error: %1</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="1201"/>
|
<location filename="../src/widget.cpp" line="1145"/>
|
||||||
<source>Temporary cache was cleaned</source>
|
<source>Temporary cache was cleaned</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="1283"/>
|
<location filename="../src/widget.cpp" line="1227"/>
|
||||||
<source>The URL has been copied to the clipboard</source>
|
<source>The URL has been copied to the clipboard</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
@@ -586,47 +581,37 @@
|
|||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="100"/>
|
<location filename="../src/downloadlist.cpp" line="101"/>
|
||||||
<source>Failed to download %1</source>
|
|
||||||
<translation type="unfinished"></translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<location filename="../src/downloadlist.cpp" line="102"/>
|
|
||||||
<source>Download Failed,Check Your Connection</source>
|
|
||||||
<translation type="unfinished"></translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<location filename="../src/downloadlist.cpp" line="114"/>
|
|
||||||
<source>Finished downloading %1, awaiting to install</source>
|
<source>Finished downloading %1, awaiting to install</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="147"/>
|
<location filename="../src/downloadlist.cpp" line="134"/>
|
||||||
<source>Installing</source>
|
<source>Installing</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="190"/>
|
<location filename="../src/downloadlist.cpp" line="177"/>
|
||||||
<source>Finish</source>
|
<source>Finish</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="196"/>
|
<location filename="../src/downloadlist.cpp" line="183"/>
|
||||||
<source>Retry</source>
|
<source>Retry</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="197"/>
|
<location filename="../src/downloadlist.cpp" line="184"/>
|
||||||
<source>Error happened in dpkg progress , you can try it again</source>
|
<source>Error happened in dpkg progress , you can try it again</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="203"/>
|
<location filename="../src/downloadlist.cpp" line="190"/>
|
||||||
<source>dpkg progress had been aborted,you can retry installation</source>
|
<source>dpkg progress had been aborted,you can retry installation</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="225"/>
|
<location filename="../src/downloadlist.cpp" line="212"/>
|
||||||
<source>Download canceled</source>
|
<source>Download canceled</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
|||||||
@@ -56,47 +56,52 @@ Nous sommes nés pour le changement.</translation>
|
|||||||
<context>
|
<context>
|
||||||
<name>SpkAppInfoLoaderThread</name>
|
<name>SpkAppInfoLoaderThread</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="167"/>
|
<location filename="../src/workerthreads.cpp" line="193"/>
|
||||||
<source>Failed to download app info. Please check internet connection.</source>
|
<source>Failed to download app info. Please check internet connection.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="48"/>
|
<location filename="../src/workerthreads.cpp" line="73"/>
|
||||||
<source>PkgName: </source>
|
<source>PkgName: </source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="49"/>
|
<location filename="../src/workerthreads.cpp" line="74"/>
|
||||||
<source>Version: </source>
|
<source>Version: </source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="52"/>
|
<location filename="../src/workerthreads.cpp" line="77"/>
|
||||||
<source>Author: </source>
|
<source>Author: </source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="57"/>
|
<location filename="../src/workerthreads.cpp" line="82"/>
|
||||||
<source>Official Site: </source>
|
<source>Official Site: </source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="61"/>
|
<location filename="../src/workerthreads.cpp" line="86"/>
|
||||||
<source>Contributor: </source>
|
<source>Contributor: </source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="62"/>
|
<location filename="../src/workerthreads.cpp" line="87"/>
|
||||||
<source>Update Time: </source>
|
<source>Update Time: </source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="63"/>
|
<location filename="../src/workerthreads.cpp" line="88"/>
|
||||||
<source>Installed Size: </source>
|
<source>Installed Size: </source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="123"/>
|
<location filename="../src/workerthreads.cpp" line="89"/>
|
||||||
|
<source>Download Times: </source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../src/workerthreads.cpp" line="149"/>
|
||||||
<source>Failed to load application icon.</source>
|
<source>Failed to load application icon.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
@@ -205,8 +210,8 @@ Nous sommes nés pour le changement.</translation>
|
|||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.ui" line="547"/>
|
<location filename="../src/widget.ui" line="547"/>
|
||||||
<location filename="../src/widget.cpp" line="906"/>
|
<location filename="../src/widget.cpp" line="910"/>
|
||||||
<location filename="../src/widget.cpp" line="1175"/>
|
<location filename="../src/widget.cpp" line="1119"/>
|
||||||
<source>Install</source>
|
<source>Install</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
@@ -365,7 +370,7 @@ Nous sommes nés pour le changement.</translation>
|
|||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.ui" line="1223"/>
|
<location filename="../src/widget.ui" line="1223"/>
|
||||||
<source><html><head/><body><p>The role of the source server is to ensure that the software is updated, and supports the use of the apt tool to get the software. We usually prefer that you use the first line as the update source, which is generally the most stable. </p></body></html></source>
|
<source><html><head/><body><p>Check update for Spark Store. </p></body></html></source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
@@ -375,7 +380,7 @@ Nous sommes nés pour le changement.</translation>
|
|||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.ui" line="1240"/>
|
<location filename="../src/widget.ui" line="1240"/>
|
||||||
<source>Source Server</source>
|
<source>Spark Store Update</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
@@ -552,15 +557,15 @@ Nous sommes nés pour le changement.</translation>
|
|||||||
<translation type="vanished">Redémarrez pour prendre effet</translation>
|
<translation type="vanished">Redémarrez pour prendre effet</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source><html><head/><body><p>源服务器的作用是保证软件更新,并且支持使用apt工具获取软件。通常我们更建议你使用第一个线路作为更新源,一般是最稳定的。</p></body></html></source>
|
<source><html><head/><body><p>跳转到星火应用商店主页检测更新。</p></body></html></source>
|
||||||
<translation type="vanished"><html><head/><body><p>Le rôle du serveur source est de s'assurer que le logiciel est mis à jour et prend en charge l'utilisation de l'outil apt pour obtenir le logiciel. Nous préférons généralement que vous utilisiez la première ligne comme source de mise à jour, qui est généralement la plus stable. </p></body></html></translation>
|
<translation type="vanished"><html><head/><body><p>Le rôle du serveur source est de s'assurer que le logiciel est mis à jour et prend en charge l'utilisation de l'outil apt pour obtenir le logiciel. Nous préférons généralement que vous utilisiez la première ligne comme source de mise à jour, qui est généralement la plus stable. </p></body></html></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>更新源</source>
|
<source>跳转更新</source>
|
||||||
<translation type="vanished">Mettre à jour la source APT</translation>
|
<translation type="vanished">Mettre à jour la source APT</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>更新源服务器:</source>
|
<source>星火应用商店更新检测:</source>
|
||||||
<translation type="vanished">Source APT: </translation>
|
<translation type="vanished">Source APT: </translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
@@ -601,97 +606,87 @@ Nous sommes nés pour le changement.</translation>
|
|||||||
<translation type="vanished"><html><head/><body><p>Nous ne sommes pas l'équipe officielle, tout comme vous, nous ne sommes qu'un des nombreux passionnés et utilisateurs de systèmes Linux / deepin, nous développons et gérons le "Spark Store"! ", est de rassembler la communauté pour partager des logiciels utiles, ou pour participer au développement ensemble, afin que nous utilisions tous les derniers et meilleurs logiciels. </p><p> Nous n'en tirons aucun profit, tous les développeurs et mainteneurs ne sont pas payés, et nous comptons sur les dons de la communauté pour la plupart de nos dépenses, dont nous sommes reconnaissants et qui nous permettent de ne pas dépenser trop d'énergie se soucier du financement. </p><p>Notre service et nos logiciels sont gratuits pour tout le monde à utiliser, à communiquer et à apprendre, mais vous devez vous conformer aux lois et réglementations locales dans le processus de votre utilisation, sinon tout problème n'a rien à voir avec nous. </p><p>Si une partie du magasin enfreint vos droits, veuillez nous en informer &lt;jifengshenmo@outlook.com&gt; nous retirerons le contenu en infraction dès que possible. </p><p>Si vous souhaitez également vous impliquer avec nous, que vous soyez impliqué dans le développement, la conception, le pitching ou la soumission de travaux, nous vous invitons à nous rejoindre. </p><p>QQ group:872690351<br/></p></body></html></translation>
|
<translation type="vanished"><html><head/><body><p>Nous ne sommes pas l'équipe officielle, tout comme vous, nous ne sommes qu'un des nombreux passionnés et utilisateurs de systèmes Linux / deepin, nous développons et gérons le "Spark Store"! ", est de rassembler la communauté pour partager des logiciels utiles, ou pour participer au développement ensemble, afin que nous utilisions tous les derniers et meilleurs logiciels. </p><p> Nous n'en tirons aucun profit, tous les développeurs et mainteneurs ne sont pas payés, et nous comptons sur les dons de la communauté pour la plupart de nos dépenses, dont nous sommes reconnaissants et qui nous permettent de ne pas dépenser trop d'énergie se soucier du financement. </p><p>Notre service et nos logiciels sont gratuits pour tout le monde à utiliser, à communiquer et à apprendre, mais vous devez vous conformer aux lois et réglementations locales dans le processus de votre utilisation, sinon tout problème n'a rien à voir avec nous. </p><p>Si une partie du magasin enfreint vos droits, veuillez nous en informer &lt;jifengshenmo@outlook.com&gt; nous retirerons le contenu en infraction dès que possible. </p><p>Si vous souhaitez également vous impliquer avec nous, que vous soyez impliqué dans le développement, la conception, le pitching ou la soumission de travaux, nous vous invitons à nous rejoindre. </p><p>QQ group:872690351<br/></p></body></html></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="138"/>
|
<location filename="../src/widget.cpp" line="139"/>
|
||||||
<location filename="../src/widget.cpp" line="406"/>
|
<location filename="../src/widget.cpp" line="409"/>
|
||||||
<location filename="../src/widget.cpp" line="411"/>
|
<location filename="../src/widget.cpp" line="414"/>
|
||||||
<location filename="../src/widget.cpp" line="421"/>
|
<location filename="../src/widget.cpp" line="424"/>
|
||||||
<location filename="../src/widget.cpp" line="426"/>
|
<location filename="../src/widget.cpp" line="429"/>
|
||||||
<source>Spark\ Store</source>
|
<source>Spark\ Store</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="186"/>
|
<location filename="../src/widget.cpp" line="187"/>
|
||||||
<source>Spark Store</source>
|
<source>Spark Store</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="187"/>
|
<location filename="../src/widget.cpp" line="188"/>
|
||||||
<source>Search or enter spk://</source>
|
<source>Search or enter spk://</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="193"/>
|
<location filename="../src/widget.cpp" line="194"/>
|
||||||
<source>Submit App</source>
|
<source>Submit App</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="194"/>
|
<location filename="../src/widget.cpp" line="195"/>
|
||||||
<source>Settings</source>
|
<source>Settings</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="195"/>
|
<location filename="../src/widget.cpp" line="196"/>
|
||||||
<source>APP Upgrade and Install Settings</source>
|
<source>APP Upgrade and Install Settings</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="344"/>
|
<location filename="../src/widget.cpp" line="347"/>
|
||||||
<source>Not Exist</source>
|
<source>Not Exist</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="656"/>
|
<location filename="../src/widget.cpp" line="659"/>
|
||||||
<location filename="../src/widget.cpp" line="895"/>
|
<location filename="../src/widget.cpp" line="899"/>
|
||||||
<source>Reinstall</source>
|
<source>Reinstall</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="622"/>
|
<location filename="../src/widget.cpp" line="625"/>
|
||||||
<source>Failed to get the name to the file to be downloaded.</source>
|
<source>Failed to get the name to the file to be downloaded.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="706"/>
|
<location filename="../src/widget.cpp" line="710"/>
|
||||||
<source>Relative apps Not Found!</source>
|
<source>Relative apps Not Found!</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="715"/>
|
<location filename="../src/widget.cpp" line="719"/>
|
||||||
<source>Request Error: %1</source>
|
<source>Request Error: %1</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="900"/>
|
<location filename="../src/widget.cpp" line="904"/>
|
||||||
<source>Upgrade</source>
|
<source>Upgrade</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="1083"/>
|
<location filename="../src/widget.cpp" line="1091"/>
|
||||||
<source>Updating, please wait...</source>
|
<source>Updating, please wait...</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="1144"/>
|
<location filename="../src/widget.cpp" line="1123"/>
|
||||||
<source>Apt has reported an error. Please use apt update in terminal to locate the problem.</source>
|
|
||||||
<translation type="unfinished"></translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<location filename="../src/widget.cpp" line="1151"/>
|
|
||||||
<source>Unknown error!</source>
|
|
||||||
<translation type="unfinished"></translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<location filename="../src/widget.cpp" line="1179"/>
|
|
||||||
<source>Uninstall succeeded</source>
|
<source>Uninstall succeeded</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="1201"/>
|
<location filename="../src/widget.cpp" line="1145"/>
|
||||||
<source>Temporary cache was cleaned</source>
|
<source>Temporary cache was cleaned</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="1283"/>
|
<location filename="../src/widget.cpp" line="1227"/>
|
||||||
<source>The URL has been copied to the clipboard</source>
|
<source>The URL has been copied to the clipboard</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
@@ -780,47 +775,37 @@ Nous sommes nés pour le changement.</translation>
|
|||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="100"/>
|
<location filename="../src/downloadlist.cpp" line="101"/>
|
||||||
<source>Failed to download %1</source>
|
|
||||||
<translation type="unfinished"></translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<location filename="../src/downloadlist.cpp" line="102"/>
|
|
||||||
<source>Download Failed,Check Your Connection</source>
|
|
||||||
<translation type="unfinished"></translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<location filename="../src/downloadlist.cpp" line="114"/>
|
|
||||||
<source>Finished downloading %1, awaiting to install</source>
|
<source>Finished downloading %1, awaiting to install</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="147"/>
|
<location filename="../src/downloadlist.cpp" line="134"/>
|
||||||
<source>Installing</source>
|
<source>Installing</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="190"/>
|
<location filename="../src/downloadlist.cpp" line="177"/>
|
||||||
<source>Finish</source>
|
<source>Finish</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="196"/>
|
<location filename="../src/downloadlist.cpp" line="183"/>
|
||||||
<source>Retry</source>
|
<source>Retry</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="197"/>
|
<location filename="../src/downloadlist.cpp" line="184"/>
|
||||||
<source>Error happened in dpkg progress , you can try it again</source>
|
<source>Error happened in dpkg progress , you can try it again</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="203"/>
|
<location filename="../src/downloadlist.cpp" line="190"/>
|
||||||
<source>dpkg progress had been aborted,you can retry installation</source>
|
<source>dpkg progress had been aborted,you can retry installation</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="225"/>
|
<location filename="../src/downloadlist.cpp" line="212"/>
|
||||||
<source>Download canceled</source>
|
<source>Download canceled</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/main.cpp" line="37"/>
|
<location filename="../src/main.cpp" line="37"/>
|
||||||
<source><span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span></source>
|
<source><span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span></source>
|
||||||
<translation type="unfinished"><span style=' font-size:10pt;font-weight:60;'>一款社区维护的应用商店</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>星火计划开发者</span></translation>
|
<translation><span style=' font-size:10pt;font-weight:60;'>一款社区维护的应用商店</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>星火计划开发者</span></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Version 2.0+2</source>
|
<source>Version 2.0+2</source>
|
||||||
@@ -42,7 +42,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/main.cpp" line="45"/>
|
<location filename="../src/main.cpp" line="45"/>
|
||||||
<source>The Spark Project</source>
|
<source>The Spark Project</source>
|
||||||
<translation type="unfinished">星火计划 The Spark Project</translation>
|
<translation>星火计划 The Spark Project</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source><span style=' font-size:10pt;font-weight:60;'>An appstore powered by deepin community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span><br/>We publish this program under GPL V3</source>
|
<source><span style=' font-size:10pt;font-weight:60;'>An appstore powered by deepin community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span><br/>We publish this program under GPL V3</source>
|
||||||
@@ -57,47 +57,52 @@
|
|||||||
<context>
|
<context>
|
||||||
<name>SpkAppInfoLoaderThread</name>
|
<name>SpkAppInfoLoaderThread</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="167"/>
|
<location filename="../src/workerthreads.cpp" line="193"/>
|
||||||
<source>Failed to download app info. Please check internet connection.</source>
|
<source>Failed to download app info. Please check internet connection.</source>
|
||||||
<translation>下载应用程序详细信息失败,请检查网络连接。</translation>
|
<translation>下载应用程序详细信息失败,请检查网络连接。</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="48"/>
|
<location filename="../src/workerthreads.cpp" line="73"/>
|
||||||
<source>PkgName: </source>
|
<source>PkgName: </source>
|
||||||
<translation>包名: </translation>
|
<translation>包名: </translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="49"/>
|
<location filename="../src/workerthreads.cpp" line="74"/>
|
||||||
<source>Version: </source>
|
<source>Version: </source>
|
||||||
<translation>版本: </translation>
|
<translation>版本: </translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="52"/>
|
<location filename="../src/workerthreads.cpp" line="77"/>
|
||||||
<source>Author: </source>
|
<source>Author: </source>
|
||||||
<translation>作者: </translation>
|
<translation>作者: </translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="57"/>
|
<location filename="../src/workerthreads.cpp" line="82"/>
|
||||||
<source>Official Site: </source>
|
<source>Official Site: </source>
|
||||||
<translation>官网: </translation>
|
<translation>官网: </translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="61"/>
|
<location filename="../src/workerthreads.cpp" line="86"/>
|
||||||
<source>Contributor: </source>
|
<source>Contributor: </source>
|
||||||
<translation>投稿者: </translation>
|
<translation>投稿者: </translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="62"/>
|
<location filename="../src/workerthreads.cpp" line="87"/>
|
||||||
<source>Update Time: </source>
|
<source>Update Time: </source>
|
||||||
<translation>更新时间: </translation>
|
<translation>更新时间: </translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="63"/>
|
<location filename="../src/workerthreads.cpp" line="88"/>
|
||||||
<source>Installed Size: </source>
|
<source>Installed Size: </source>
|
||||||
<translation>大小: </translation>
|
<translation>大小: </translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/workerthreads.cpp" line="123"/>
|
<location filename="../src/workerthreads.cpp" line="89"/>
|
||||||
|
<source>Download Times: </source>
|
||||||
|
<translation>下载量: </translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../src/workerthreads.cpp" line="149"/>
|
||||||
<source>Failed to load application icon.</source>
|
<source>Failed to load application icon.</source>
|
||||||
<translation>加载应用程序图标失败。</translation>
|
<translation>加载应用程序图标失败。</translation>
|
||||||
</message>
|
</message>
|
||||||
@@ -199,8 +204,8 @@
|
|||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.ui" line="547"/>
|
<location filename="../src/widget.ui" line="547"/>
|
||||||
<location filename="../src/widget.cpp" line="906"/>
|
<location filename="../src/widget.cpp" line="910"/>
|
||||||
<location filename="../src/widget.cpp" line="1175"/>
|
<location filename="../src/widget.cpp" line="1119"/>
|
||||||
<source>Install</source>
|
<source>Install</source>
|
||||||
<translation>安装</translation>
|
<translation>安装</translation>
|
||||||
</message>
|
</message>
|
||||||
@@ -374,19 +379,18 @@
|
|||||||
<translation type="vanished">重启商店后生效</translation>
|
<translation type="vanished">重启商店后生效</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.ui" line="1223"/>
|
<source><html><head/><body><p>Jump to the Spark app store home page to check for updates. </p></body></html></source>
|
||||||
<source><html><head/><body><p>The role of the source server is to ensure that the software is updated, and supports the use of the apt tool to get the software. We usually prefer that you use the first line as the update source, which is generally the most stable. </p></body></html></source>
|
<translation type="vanished"><html><head/><body><p>跳转到星火应用商店主页检测更新。</p></body></html></translation>
|
||||||
<translation><html><head/><body><p>源服务器的作用是保证软件更新,并且支持使用apt工具获取软件。通常我们更建议你使用第一个线路作为更新源,一般是最稳定的。</p></body></html></translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.ui" line="1233"/>
|
<location filename="../src/widget.ui" line="1233"/>
|
||||||
<source>Update</source>
|
<source>Update</source>
|
||||||
<translation>更新源</translation>
|
<translation>跳转更新</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.ui" line="1240"/>
|
<location filename="../src/widget.ui" line="1240"/>
|
||||||
<source>Source Server</source>
|
<source>Spark Store Update</source>
|
||||||
<translation>更新源服务器</translation>
|
<translation>星火应用商店更新检测</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.ui" line="1260"/>
|
<location filename="../src/widget.ui" line="1260"/>
|
||||||
@@ -471,54 +475,63 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.ui" line="912"/>
|
<location filename="../src/widget.ui" line="912"/>
|
||||||
<source>Request Update</source>
|
<source>Request Update</source>
|
||||||
<translation type="unfinished">软件催更/应用反馈</translation>
|
<translation>软件催更/应用反馈</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.ui" line="1194"/>
|
<location filename="../src/widget.ui" line="1194"/>
|
||||||
<source>Take effect when restart</source>
|
<source>Take effect when restart</source>
|
||||||
<translation>重启商店后生效</translation>
|
<translation>重启商店后生效</translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../src/widget.ui" line="1223"/>
|
||||||
|
<source><html><head/><body><p>Check update for Spark Store. </p></body></html></source>
|
||||||
|
<translation>检查星火应用商店更新</translation>
|
||||||
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.ui" line="1334"/>
|
<location filename="../src/widget.ui" line="1334"/>
|
||||||
<source>0B</source>
|
<source>0B</source>
|
||||||
<translation></translation>
|
<translation></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="186"/>
|
<location filename="../src/widget.cpp" line="187"/>
|
||||||
<source>Spark Store</source>
|
<source>Spark Store</source>
|
||||||
<translation>Spark 应用商店</translation>
|
<translation>Spark 应用商店</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="187"/>
|
<location filename="../src/widget.cpp" line="188"/>
|
||||||
<source>Search or enter spk://</source>
|
<source>Search or enter spk://</source>
|
||||||
<translation>搜索或打开链接</translation>
|
<translation>搜索或打开链接</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="193"/>
|
<location filename="../src/widget.cpp" line="194"/>
|
||||||
<source>Submit App</source>
|
<source>Submit App</source>
|
||||||
<translation>投递应用</translation>
|
<translation>投递应用</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="194"/>
|
<location filename="../src/widget.cpp" line="195"/>
|
||||||
<source>Settings</source>
|
<source>Settings</source>
|
||||||
<translation>设置</translation>
|
<translation>设置</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="195"/>
|
<location filename="../src/widget.cpp" line="196"/>
|
||||||
<source>APP Upgrade and Install Settings</source>
|
<source>APP Upgrade and Install Settings</source>
|
||||||
<translation>应用更新和安装设置</translation>
|
<translation>应用更新和安装设置</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="344"/>
|
<location filename="../src/widget.cpp" line="347"/>
|
||||||
<source>Not Exist</source>
|
<source>Not Exist</source>
|
||||||
<translation>不存在</translation>
|
<translation>不存在</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="138"/>
|
<source>Update finished</source>
|
||||||
<location filename="../src/widget.cpp" line="406"/>
|
<translation type="obsolete">更新完毕</translation>
|
||||||
<location filename="../src/widget.cpp" line="411"/>
|
</message>
|
||||||
<location filename="../src/widget.cpp" line="421"/>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="426"/>
|
<location filename="../src/widget.cpp" line="139"/>
|
||||||
|
<location filename="../src/widget.cpp" line="409"/>
|
||||||
|
<location filename="../src/widget.cpp" line="414"/>
|
||||||
|
<location filename="../src/widget.cpp" line="424"/>
|
||||||
|
<location filename="../src/widget.cpp" line="429"/>
|
||||||
<source>Spark\ Store</source>
|
<source>Spark\ Store</source>
|
||||||
<translation>星火应用商店</translation>
|
<translation>星火应用商店</translation>
|
||||||
</message>
|
</message>
|
||||||
@@ -555,8 +568,8 @@
|
|||||||
<translation type="vanished">大小: </translation>
|
<translation type="vanished">大小: </translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="656"/>
|
<location filename="../src/widget.cpp" line="659"/>
|
||||||
<location filename="../src/widget.cpp" line="895"/>
|
<location filename="../src/widget.cpp" line="899"/>
|
||||||
<source>Reinstall</source>
|
<source>Reinstall</source>
|
||||||
<translation>重新安装</translation>
|
<translation>重新安装</translation>
|
||||||
</message>
|
</message>
|
||||||
@@ -565,17 +578,17 @@
|
|||||||
<translation type="vanished">加载应用程序图标失败。</translation>
|
<translation type="vanished">加载应用程序图标失败。</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="622"/>
|
<location filename="../src/widget.cpp" line="625"/>
|
||||||
<source>Failed to get the name to the file to be downloaded.</source>
|
<source>Failed to get the name to the file to be downloaded.</source>
|
||||||
<translation>获取安装包文件名失败。</translation>
|
<translation>获取安装包文件名失败。</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="706"/>
|
<location filename="../src/widget.cpp" line="710"/>
|
||||||
<source>Relative apps Not Found!</source>
|
<source>Relative apps Not Found!</source>
|
||||||
<translation>相关应用未找到!</translation>
|
<translation>相关应用未找到!</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="715"/>
|
<location filename="../src/widget.cpp" line="719"/>
|
||||||
<source>Request Error: %1</source>
|
<source>Request Error: %1</source>
|
||||||
<translation>请求错误:%1</translation>
|
<translation>请求错误:%1</translation>
|
||||||
</message>
|
</message>
|
||||||
@@ -584,24 +597,22 @@
|
|||||||
<translation type="vanished">目前仅支持商店专用链接的打开,搜索功能正在开发,请期待以后的版本!</translation>
|
<translation type="vanished">目前仅支持商店专用链接的打开,搜索功能正在开发,请期待以后的版本!</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="900"/>
|
<location filename="../src/widget.cpp" line="904"/>
|
||||||
<source>Upgrade</source>
|
<source>Upgrade</source>
|
||||||
<translation>升级</translation>
|
<translation>升级</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="1083"/>
|
<location filename="../src/widget.cpp" line="1091"/>
|
||||||
<source>Updating, please wait...</source>
|
<source>Updating, please wait...</source>
|
||||||
<translation>正在更新,请稍候……</translation>
|
<translation>正在更新,请稍候……</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="1144"/>
|
|
||||||
<source>Apt has reported an error. Please use apt update in terminal to locate the problem.</source>
|
<source>Apt has reported an error. Please use apt update in terminal to locate the problem.</source>
|
||||||
<translation>更新中发生错误,请在终端使用apt update来查看错误原因。</translation>
|
<translation type="vanished">更新中发生错误,请在终端使用apt update来查看错误原因。</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="1151"/>
|
|
||||||
<source>Unknown error!</source>
|
<source>Unknown error!</source>
|
||||||
<translation>未知错误!</translation>
|
<translation type="vanished">未知错误!</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Yes</source>
|
<source>Yes</source>
|
||||||
@@ -651,17 +662,17 @@ Click yes to continue.</source>
|
|||||||
<translation type="vanished">服务器未知错误</translation>
|
<translation type="vanished">服务器未知错误</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="1179"/>
|
<location filename="../src/widget.cpp" line="1123"/>
|
||||||
<source>Uninstall succeeded</source>
|
<source>Uninstall succeeded</source>
|
||||||
<translation>卸载成功</translation>
|
<translation>卸载成功</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="1201"/>
|
<location filename="../src/widget.cpp" line="1145"/>
|
||||||
<source>Temporary cache was cleaned</source>
|
<source>Temporary cache was cleaned</source>
|
||||||
<translation>缓存目录已清空</translation>
|
<translation>缓存目录已清空</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/widget.cpp" line="1283"/>
|
<location filename="../src/widget.cpp" line="1227"/>
|
||||||
<source>The URL has been copied to the clipboard</source>
|
<source>The URL has been copied to the clipboard</source>
|
||||||
<translation>链接已复制到剪贴板</translation>
|
<translation>链接已复制到剪贴板</translation>
|
||||||
</message>
|
</message>
|
||||||
@@ -732,22 +743,20 @@ Click yes to continue.</source>
|
|||||||
<translation type="vanished">已完成,等待安装</translation>
|
<translation type="vanished">已完成,等待安装</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="100"/>
|
|
||||||
<source>Failed to download %1</source>
|
<source>Failed to download %1</source>
|
||||||
<translation>下载 %1 失败</translation>
|
<translation type="vanished">下载 %1 失败</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="102"/>
|
|
||||||
<source>Download Failed,Check Your Connection</source>
|
<source>Download Failed,Check Your Connection</source>
|
||||||
<translation>下载失败,请检查网络连接</translation>
|
<translation type="vanished">下载失败,请检查网络连接</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="114"/>
|
<location filename="../src/downloadlist.cpp" line="101"/>
|
||||||
<source>Finished downloading %1, awaiting to install</source>
|
<source>Finished downloading %1, awaiting to install</source>
|
||||||
<translation>%1 下载完成,等待安装</translation>
|
<translation>%1 下载完成,等待安装</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="147"/>
|
<location filename="../src/downloadlist.cpp" line="134"/>
|
||||||
<source>Installing</source>
|
<source>Installing</source>
|
||||||
<translation>正在安装</translation>
|
<translation>正在安装</translation>
|
||||||
</message>
|
</message>
|
||||||
@@ -758,30 +767,30 @@ Click yes to continue.</source>
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="74"/>
|
<location filename="../src/downloadlist.cpp" line="74"/>
|
||||||
<source>Downloaded. Open APP Upgrade and Install Settings to enable password-free installation</source>
|
<source>Downloaded. Open APP Upgrade and Install Settings to enable password-free installation</source>
|
||||||
<translation type="unfinished">下载完成 可进入应用更新和安装设置来启动免密码安装</translation>
|
<translation>下载完成 可进入应用更新和安装设置来启动免密码安装</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="190"/>
|
<location filename="../src/downloadlist.cpp" line="177"/>
|
||||||
<source>Finish</source>
|
<source>Finish</source>
|
||||||
<translation>完成</translation>
|
<translation>完成</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="196"/>
|
<location filename="../src/downloadlist.cpp" line="183"/>
|
||||||
<source>Retry</source>
|
<source>Retry</source>
|
||||||
<translation>重试</translation>
|
<translation>重试</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="197"/>
|
<location filename="../src/downloadlist.cpp" line="184"/>
|
||||||
<source>Error happened in dpkg progress , you can try it again</source>
|
<source>Error happened in dpkg progress , you can try it again</source>
|
||||||
<translation>dpkg出现错误,可重新安装</translation>
|
<translation>dpkg出现错误,可重新安装</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="203"/>
|
<location filename="../src/downloadlist.cpp" line="190"/>
|
||||||
<source>dpkg progress had been aborted,you can retry installation</source>
|
<source>dpkg progress had been aborted,you can retry installation</source>
|
||||||
<translation>安装被中止,可重新安装</translation>
|
<translation>安装被中止,可重新安装</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/downloadlist.cpp" line="225"/>
|
<location filename="../src/downloadlist.cpp" line="212"/>
|
||||||
<source>Download canceled</source>
|
<source>Download canceled</source>
|
||||||
<translation>下载已取消</translation>
|
<translation>下载已取消</translation>
|
||||||
</message>
|
</message>
|
||||||
|
|||||||
Reference in New Issue
Block a user