mirror of
https://gitee.com/amber-ce/amber-pm
synced 2026-06-22 14:13:54 +08:00
Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8838d900f0 | |||
| 0f6780e4f4 | |||
| 3edefa0243 | |||
| 0f9a4ed76a | |||
| 7b8ceb8328 | |||
| c54a9d39c2 | |||
| a2b7bc9826 | |||
| 40809464f2 | |||
| 31c4ee9c25 | |||
| 908f3ab9de | |||
| 7b06cf293b | |||
| 137460768f | |||
| c3486af9a5 | |||
| 9bbcb06c59 | |||
| 1c7ce04f42 | |||
| d13b0b596b | |||
| 0d41828ece | |||
| f8ce04cae3 | |||
| 6b4d95b363 |
@@ -76,6 +76,14 @@ PACKAGE_NAME="$DPKG_MAINTSCRIPT_PACKAGE"
|
|||||||
if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
|
if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
|
||||||
echo "清理卸载残留"
|
echo "清理卸载残留"
|
||||||
rm -rf "/var/lib/apm/$PACKAGE_NAME"
|
rm -rf "/var/lib/apm/$PACKAGE_NAME"
|
||||||
|
for username in $(ls /home)
|
||||||
|
do
|
||||||
|
echo /home/$username
|
||||||
|
if [ -d "/home/$username/.apm/$PACKAGE_NAME" ]
|
||||||
|
then
|
||||||
|
rm -fr "/home/$username/.apm/$PACKAGE_NAME"
|
||||||
|
fi
|
||||||
|
done
|
||||||
else
|
else
|
||||||
echo "非卸载,跳过清理"
|
echo "非卸载,跳过清理"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -26,22 +26,29 @@ Usage:
|
|||||||
Commands:
|
Commands:
|
||||||
install 安装软件包
|
install 安装软件包
|
||||||
remove 卸载软件包
|
remove 卸载软件包
|
||||||
|
run <package> 运行指定软件包的可执行文件
|
||||||
|
sandbox-run <package> 运行指定软件包的可执行文件(主目录沙箱化)
|
||||||
|
|
||||||
update 更新软件包信息
|
update 更新软件包信息
|
||||||
|
hold 锁定软件包版本
|
||||||
|
unhold 解锁软件包版本
|
||||||
|
full-upgrade 升级全部软件包
|
||||||
list 查看可用软件包信息
|
list 查看可用软件包信息
|
||||||
show 查看软件包信息
|
|
||||||
search 搜索软件包
|
search 搜索软件包
|
||||||
|
|
||||||
download 下载包
|
download 下载包
|
||||||
|
show 展示包信息
|
||||||
clean 清除缓存软件包
|
clean 清除缓存软件包
|
||||||
autoremove 自动移除不需要的包
|
autoremove 自动移除不需要的包
|
||||||
full-upgrade 完全升级软件包
|
|
||||||
run <package> 运行指定软件包的可执行文件
|
|
||||||
ssaudit <path> 使用 ssaudit 进行本地软件安装,详情见 spark-store
|
ssaudit <path> 使用 ssaudit 进行本地软件安装,详情见 spark-store
|
||||||
debug 显示调试系统信息并进入调试环境
|
debug 显示调试系统信息并进入调试环境
|
||||||
|
|
||||||
amber 彩蛋功能
|
amber 彩蛋功能
|
||||||
xmp360 彩蛋功能
|
xmp360 彩蛋功能
|
||||||
bronya 彩蛋功能
|
bronya 彩蛋功能
|
||||||
|
|
||||||
-h, --help 显示此帮助信息
|
-h, --help 显示此帮助信息
|
||||||
|
-v, --version 展示APM版本号
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
+34
@@ -0,0 +1,34 @@
|
|||||||
|
玲珑官方搞了个这玩意,APM用户这边有人想要那我就写了,其实意义不大
|
||||||
|
|
||||||
|
好用就完了,APM又快又简单
|
||||||
|
|
||||||
|
| 特性 | 如意玲珑 | 琥珀 APM | Snap | AppImage |
|
||||||
|
| ------------------------- | ------------------------------- | ------------- | ---------------- | -------------------------------------- |
|
||||||
|
| 打包桌面应用 | ✔ | ✔ | ✔ | ✔ |
|
||||||
|
| 打包终端应用 | ✔ | ✔ | ✔ | ✔ |
|
||||||
|
| 处理服务器应用 | ✔ | ✔ | ✔ | ✘ |
|
||||||
|
| 打包系统服务(root 权限) | ✘ | ✘ | ✔ | ✘ |
|
||||||
|
| 主题功能正常 | ✔ | ✔ | ✔ | ✔ |
|
||||||
|
| 提供库托管服务 | ✔ | ✔ | ✘ | ✘ |
|
||||||
|
| 库/依赖来源 | 包自身携带 | 包自身携带或使用 APM 中层 Base,用法详见[链接](https://bbs.deepin.org.cn/post/292648) | | |
|
||||||
|
| SDK | 包自身携带 | 无需专用SDK,复用Debian即可 | | |
|
||||||
|
| 商业支持 | ✔ | ✘ | ✔ | ✘ |
|
||||||
|
| 应用商店数量 | 预计 4700+ | 200+常用软件,持续扩充中 | 6600+ | 1300+ |
|
||||||
|
| 开发工具支持 | linglong-builder | 任意支持部署到debian的工具均支持 | electron-builder | |
|
||||||
|
| 容器支持 | ✔ | ✔ | ✔ | ◐ (官方不提供,技术上可行) |
|
||||||
|
| rootless 容器 | ✔ | ✔ | ✘ | ✘ |
|
||||||
|
| 不安装运行 | ✔ (提供 Bundle 模式) | ◐ (官方不提供,技术上可行) | ✘ | ✔ |
|
||||||
|
| 不解压运行 | ✔ (提供 Bundle 模式) | ◐ (官方不提供,技术上可行) | ✔ | ✔ |
|
||||||
|
| 自分发/绿色格式分发 | ✔ | ◐ (官方不提供,技术上可行) | ✘ | ✔ |
|
||||||
|
| 支持 Wine 应用运行 | ✔ | ✔ | ◐ (理论可行) | ◐ (使用 LD 修改 open 调用,兼容性差) |
|
||||||
|
| 离线环境支持 | ✔ | ✔ | ✔ | ✔ |
|
||||||
|
| 权限管理 | ✔ | ✘ | ✔ | ✘ |
|
||||||
|
| 中心仓库 | mirror-repo-linglong.deepin.com | 星火应用商店 | Snap Store | AppImageHub |
|
||||||
|
| 多版本共存 | ✔ | ✔ | ✔ | ✔ |
|
||||||
|
| 点对点分发 | ✔ | ✔ | ✔ | ✔ |
|
||||||
|
| 多镜像源加速分发 | ✘ | ✔ | ✘ | ◐ (官方不提供,技术上可行) |
|
||||||
|
| 作为普通安装包直接安装到宿主机 | ✘ | ✔ | ✘ | ✘ |
|
||||||
|
| 自定义生成 runtime base | ✘ | ✔ | ✘ | ✘ |
|
||||||
|
| 多级layer自动管理 | ◐ (理论可行) | ✔ | ✘ | ✘ |
|
||||||
|
| 一键直接转换 Debian 标准软件包 | ✘ | ✔ | ✘ | ✘ |
|
||||||
|
| 应用升级 | 仓库升级 | 仓库升级 | 仓库升级 | 官方工具升级 |
|
||||||
+4
-4
@@ -1,10 +1,10 @@
|
|||||||
Package: apm
|
Package: apm
|
||||||
Source: amber-ce
|
Source: amber-ce
|
||||||
Version: 1.1.0
|
Version: 1.1.2
|
||||||
Architecture: amd64
|
Architecture: arm64
|
||||||
Maintainer: shenmo <shenmo@spark-app.store>
|
Maintainer: shenmo <shenmo@spark-app.store>
|
||||||
Installed-Size: 48724
|
Installed-Size: 46496
|
||||||
Depends: bubblewrap, flatpak, policykit-1 | pkexec | polkit-1 | polkit, systemd, procps,coreutils,fuse-overlayfs,xz-utils
|
Depends: bubblewrap, flatpak, policykit-1 | pkexec | polkit-1 | polkit, systemd, procps,coreutils,fuse-overlayfs,xz-utils,libnotify-bin,curl,xdg-user-dirs
|
||||||
Section: misc
|
Section: misc
|
||||||
Conflicts: ace-host-integration
|
Conflicts: ace-host-integration
|
||||||
Priority: optional
|
Priority: optional
|
||||||
|
|||||||
@@ -10,6 +10,16 @@ if [ "$1" = "remove" ] || [ "$1" = "purge" ];then
|
|||||||
echo "清理卸载残留"
|
echo "清理卸载残留"
|
||||||
|
|
||||||
rm -rf /var/lib/apm/
|
rm -rf /var/lib/apm/
|
||||||
|
for username in $(ls /home)
|
||||||
|
do
|
||||||
|
echo /home/$username
|
||||||
|
if [ -d "/home/$username/.apm/" ]
|
||||||
|
then
|
||||||
|
rm -fr "/home/$username/.apm/"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
else
|
else
|
||||||
echo "非卸载,跳过清理"
|
echo "非卸载,跳过清理"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -7,6 +7,10 @@ log.info() { echo -e "[\e[96mINFO\e[0m]: \e[1m$*\e[0m"; }
|
|||||||
log.debug() { echo -e "[\e[32mDEBUG\e[0m]: \e[1m$*\e[0m"; }
|
log.debug() { echo -e "[\e[32mDEBUG\e[0m]: \e[1m$*\e[0m"; }
|
||||||
SCRIPT_NAME=$(basename "$0")
|
SCRIPT_NAME=$(basename "$0")
|
||||||
|
|
||||||
|
if ! command -v dpkg > /dev/null ;then
|
||||||
|
log.error "若想使用APM软件包转换器,您需先安装dpkg"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
# 显示用法信息
|
# 显示用法信息
|
||||||
usage() {
|
usage() {
|
||||||
echo "用法: $SCRIPT_NAME --base <basename> [--base <basename> ...] <deb文件路径> [--pkgname <包名>] [--version <版本号>]"
|
echo "用法: $SCRIPT_NAME --base <basename> [--base <basename> ...] <deb文件路径> [--pkgname <包名>] [--version <版本号>]"
|
||||||
@@ -274,7 +278,7 @@ mkdir -p "$MODIFIED_DEB_DIR/data"
|
|||||||
cp -r "$EXTRACT_DIR"/* "$MODIFIED_DEB_DIR/" 2>/dev/null || true
|
cp -r "$EXTRACT_DIR"/* "$MODIFIED_DEB_DIR/" 2>/dev/null || true
|
||||||
|
|
||||||
# 使用fakeroot重新打包
|
# 使用fakeroot重新打包
|
||||||
cd "$MODIFIED_DEB_DIR" && fakeroot dpkg-deb --build -Z none . "$MODIFIED_DEB_PATH"
|
cd "$MODIFIED_DEB_DIR" && fakeroot dpkg-deb --build -Z none . "$MODIFIED_DEB_PATH"
|
||||||
cd - > /dev/null
|
cd - > /dev/null
|
||||||
|
|
||||||
if [ ! -f "$MODIFIED_DEB_PATH" ]; then
|
if [ ! -f "$MODIFIED_DEB_PATH" ]; then
|
||||||
@@ -315,20 +319,28 @@ for BASENAME in "${BASENAMES[@]}"; do
|
|||||||
log.info " 写入: $BASENAME"
|
log.info " 写入: $BASENAME"
|
||||||
done
|
done
|
||||||
|
|
||||||
# 创建postinst脚本
|
# 创建postrm脚本
|
||||||
cat > "$PKG_BUILD_DIR/DEBIAN/postinst" << 'EOF'
|
cat > "$PKG_BUILD_DIR/DEBIAN/postrm" << 'EOF'
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
PACKAGE_NAME="$DPKG_MAINTSCRIPT_PACKAGE"
|
PACKAGE_NAME="$DPKG_MAINTSCRIPT_PACKAGE"
|
||||||
|
|
||||||
if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
|
if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
|
||||||
echo "清理卸载残留"
|
echo "清理卸载残留"
|
||||||
rm -rf "/var/lib/apm/$PACKAGE_NAME"
|
rm -rf "/var/lib/apm/$PACKAGE_NAME"
|
||||||
|
for username in $(ls /home)
|
||||||
|
do
|
||||||
|
echo /home/$username
|
||||||
|
if [ -d "/home/$username/.apm/$PACKAGE_NAME" ]
|
||||||
|
then
|
||||||
|
rm -fr "/home/$username/.apm/$PACKAGE_NAME"
|
||||||
|
fi
|
||||||
|
done
|
||||||
else
|
else
|
||||||
echo "非卸载,跳过清理"
|
echo "非卸载,跳过清理"
|
||||||
fi
|
fi
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
chmod +x "$PKG_BUILD_DIR/DEBIAN/postinst"
|
chmod +x "$PKG_BUILD_DIR/DEBIAN/postrm"
|
||||||
|
|
||||||
# 8. 复制文件到新的APM包
|
# 8. 复制文件到新的APM包
|
||||||
log.info "复制文件到新的APM包..."
|
log.info "复制文件到新的APM包..."
|
||||||
@@ -387,7 +399,7 @@ EOF
|
|||||||
OUTPUT_DEB="${NEW_PKGNAME}_${NEW_VERSION}_${ORIG_ARCH}.deb"
|
OUTPUT_DEB="${NEW_PKGNAME}_${NEW_VERSION}_${ORIG_ARCH}.deb"
|
||||||
|
|
||||||
# 打包
|
# 打包
|
||||||
fakeroot dpkg-deb --build "$PKG_BUILD_DIR" "$OUTPUT_DEB"
|
fakeroot dpkg-deb --build "$PKG_BUILD_DIR" "$OUTPUT_DEB"
|
||||||
|
|
||||||
log.info "转换完成!"
|
log.info "转换完成!"
|
||||||
log.info "生成的APM包: $OUTPUT_DEB"
|
log.info "生成的APM包: $OUTPUT_DEB"
|
||||||
|
|||||||
@@ -3,7 +3,29 @@
|
|||||||
if [[ ! -e "/usr/share/gxde-api" ]] && ! grep -q "Kylin" /etc/os-release; then
|
if [[ ! -e "/usr/share/gxde-api" ]] && ! grep -q "Kylin" /etc/os-release; then
|
||||||
exit 0 # No needed
|
exit 0 # No needed
|
||||||
fi
|
fi
|
||||||
|
function ensure_dir() {
|
||||||
|
local dir="$1"
|
||||||
|
|
||||||
|
# 检查目录是否为空
|
||||||
|
if [ -z "$dir" ]; then
|
||||||
|
echo "错误: 目录路径不能为空"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 检查目录是否存在
|
||||||
|
if [ ! -d "$dir" ]; then
|
||||||
|
echo "目录 '$dir' 不存在,正在创建..."
|
||||||
|
if mkdir -p "$dir"; then
|
||||||
|
echo "成功创建目录 '$dir'"
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
echo "错误: 无法创建目录 '$dir'"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
}
|
||||||
# 函数:检查目录并创建符号链接
|
# 函数:检查目录并创建符号链接
|
||||||
process_directory() {
|
process_directory() {
|
||||||
local source_dir="$1"
|
local source_dir="$1"
|
||||||
@@ -18,6 +40,8 @@ process_directory() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ensure_dir "/usr/local/share/applications/"
|
||||||
|
ensure_dir "/usr/local/share/icons/"
|
||||||
# 处理 applications 目录
|
# 处理 applications 目录
|
||||||
process_directory "/var/lib/apm/apm/files/ace-env/amber-ce-tools/data-dir/applications/" \
|
process_directory "/var/lib/apm/apm/files/ace-env/amber-ce-tools/data-dir/applications/" \
|
||||||
"/usr/local/share/applications/" "Applications"
|
"/usr/local/share/applications/" "Applications"
|
||||||
|
|||||||
Executable
+148
@@ -0,0 +1,148 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# 发送通知
|
||||||
|
|
||||||
|
function get_upgradable_list(){
|
||||||
|
output=$(env LANGUAGE=en_US amber-pm-debug aptss list --upgradable | awk NR\>1)
|
||||||
|
|
||||||
|
IFS_OLD="$IFS"
|
||||||
|
IFS=$'\n'
|
||||||
|
|
||||||
|
for line in $output ; do
|
||||||
|
PKG_NAME=$(echo $line | awk -F '/' '{print $1}')
|
||||||
|
PKG_NEW_VER=$(echo $line | awk -F ' ' '{print $2}')
|
||||||
|
PKG_CUR_VER=$(echo $line | awk -F ' ' '{print $6}' | awk -F ']' '{print $1}')
|
||||||
|
echo "${PKG_NAME} ${PKG_NEW_VER} ${PKG_CUR_VER}"
|
||||||
|
done
|
||||||
|
|
||||||
|
IFS="$IFS_OLD"
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
function get_current_user() {
|
||||||
|
# 优先通过 who 命令获取用户
|
||||||
|
local user
|
||||||
|
user=$(who | awk '{print $1}' | head -n 1 2>/dev/null)
|
||||||
|
|
||||||
|
# 如果 who 无输出,则通过 loginctl 获取
|
||||||
|
if [[ -z "$user" ]]; then
|
||||||
|
user=$(loginctl list-sessions --no-legend 2>/dev/null | awk '{print $3}' | head -n 1)
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 返回最终结果(可能为空)
|
||||||
|
echo "${user}"
|
||||||
|
}
|
||||||
|
|
||||||
|
function notify-send() {
|
||||||
|
# Detect user using the display
|
||||||
|
local user=$(get_current_user)
|
||||||
|
|
||||||
|
# Detect uid of the user
|
||||||
|
local uid=$(id -u $user)
|
||||||
|
|
||||||
|
sudo -u $user DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus notify-send "$@"
|
||||||
|
}
|
||||||
|
|
||||||
|
# 检测网络链接畅通
|
||||||
|
function network-check() {
|
||||||
|
# 超时时间
|
||||||
|
local timeout=15
|
||||||
|
|
||||||
|
# 目标网站
|
||||||
|
local target=www.baidu.com
|
||||||
|
|
||||||
|
# 获取响应状态码
|
||||||
|
local ret_code=$(curl -I -s --connect-timeout ${timeout} ${target} -w %{http_code} | tail -n1)
|
||||||
|
|
||||||
|
if [ "$ret_code" = "200" ]; then
|
||||||
|
# 网络畅通
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
# 网络不畅通
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# 初始化等待时间和最大等待时间
|
||||||
|
initial_wait_time=15 # 初始等待时间 15 秒
|
||||||
|
max_wait_time=$((12 * 3600)) # 最大等待时间 12 小时
|
||||||
|
|
||||||
|
# 检测网络,若不通则进行重试,采用指数退避算法
|
||||||
|
wait_time=$initial_wait_time
|
||||||
|
while ! network-check; do
|
||||||
|
echo "$TRANSHELL_CONTENT_NETWORK_FAIL"
|
||||||
|
echo "Waiting for network to recover... Retrying in ${wait_time} seconds."
|
||||||
|
|
||||||
|
sleep $wait_time
|
||||||
|
wait_time=$((wait_time * 2)) # 等待时间翻倍
|
||||||
|
if [ $wait_time -gt $max_wait_time ]; then
|
||||||
|
wait_time=$max_wait_time # 最大等待时间限制为12小时
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# 每日更新星火源文件
|
||||||
|
|
||||||
|
|
||||||
|
updatetext=$(LANGUAGE=en_US apm update 2>&1)
|
||||||
|
|
||||||
|
# 在网络恢复后,继续更新操作
|
||||||
|
retry_count=0
|
||||||
|
max_retries=12 # 最大重试次数,防止死循环
|
||||||
|
|
||||||
|
until ! echo $updatetext | grep -q "E:"; do
|
||||||
|
if [ $retry_count -ge $max_retries ]; then
|
||||||
|
echo "Reached maximum retry limit for apm update."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Update failed...Will retry in 15sec"
|
||||||
|
sleep 15
|
||||||
|
updatetext=$(LANGUAGE=en_US apm update 2>&1)
|
||||||
|
retry_count=$((retry_count + 1))
|
||||||
|
done
|
||||||
|
|
||||||
|
update_app_number=$(env LANGUAGE=en_US apm list --upgradable 2>/dev/null | grep -c upgradable)
|
||||||
|
echo "update_app_number is $update_app_number"
|
||||||
|
|
||||||
|
if [ "$update_app_number" -le 0 ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 获取用户选择的要更新的应用
|
||||||
|
PKG_LIST="$(get_upgradable_list)"
|
||||||
|
# 指定分隔符为 \n
|
||||||
|
IFS_OLD="$IFS"
|
||||||
|
IFS=$'\n'
|
||||||
|
|
||||||
|
for line in $PKG_LIST; do
|
||||||
|
# PKG_NAME=$(echo $line | awk -F ' ' '{print $1}')
|
||||||
|
# PKG_NEW_VER=$(echo $line | awk -F ' ' '{print $2}')
|
||||||
|
# PKG_CUR_VER=$(echo $line | awk -F ' ' '{print $3}')
|
||||||
|
|
||||||
|
# amber-pm-debug dpkg --compare-versions $PKG_NEW_VER le $PKG_CUR_VER
|
||||||
|
#
|
||||||
|
# if [ $? -eq 0 ]; then
|
||||||
|
# let update_app_number=$update_app_number-1
|
||||||
|
# continue
|
||||||
|
# fi
|
||||||
|
|
||||||
|
# 检测是否是 hold 状态
|
||||||
|
PKG_STA=$(amber-pm-debug dpkg-query -W -f='\''\${db:Status-Want}'\' $PKG_NAME)
|
||||||
|
#PKG_STA=$(dpkg-query -W -f='${db:Status-Want}' $PKG_NAME)
|
||||||
|
if [ "$PKG_STA" = "hold" ]; then
|
||||||
|
let update_app_number=$update_app_number-1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# 还原分隔符
|
||||||
|
IFS="$IFS_OLD"
|
||||||
|
if [ $update_app_number -le 0 ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 如果都是hold或者版本一致的那就直接退出,否则把剩余的给提醒了
|
||||||
|
# TODO: 除了apt-mark hold之外额外有一个禁止检查列表
|
||||||
|
|
||||||
|
|
||||||
|
notify-send -a apm "APM 琥珀应用包" "有 $update_app_number 个应用可以更新啦,apm list --upgradable 以查看" || true # Some machine don't have bus, or who command just print nothing.
|
||||||
|
|
||||||
+41
-8
@@ -1,5 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
VERSION=1.1.0
|
VERSION=1.1.2
|
||||||
# 获取脚本名称用于帮助信息
|
# 获取脚本名称用于帮助信息
|
||||||
SCRIPT_NAME=$(basename "$0")
|
SCRIPT_NAME=$(basename "$0")
|
||||||
PATH_PREFIX=/var/lib/apm/apm/files/ace-env/
|
PATH_PREFIX=/var/lib/apm/apm/files/ace-env/
|
||||||
@@ -21,22 +21,29 @@ Usage:
|
|||||||
Commands:
|
Commands:
|
||||||
install 安装软件包
|
install 安装软件包
|
||||||
remove 卸载软件包
|
remove 卸载软件包
|
||||||
|
run <package> 运行指定软件包的可执行文件
|
||||||
|
sandbox-run <package> 运行指定软件包的可执行文件(主目录沙箱化)
|
||||||
|
|
||||||
update 更新软件包信息
|
update 更新软件包信息
|
||||||
|
hold 锁定软件包版本
|
||||||
|
unhold 解锁软件包版本
|
||||||
|
full-upgrade 升级全部软件包
|
||||||
list 查看可用软件包信息
|
list 查看可用软件包信息
|
||||||
search 搜索软件包
|
search 搜索软件包
|
||||||
|
|
||||||
download 下载包
|
download 下载包
|
||||||
show 展示包信息
|
show 展示包信息
|
||||||
clean 清除缓存软件包
|
clean 清除缓存软件包
|
||||||
autoremove 自动移除不需要的包
|
autoremove 自动移除不需要的包
|
||||||
full-upgrade 完全升级软件包
|
|
||||||
run <package> 运行指定软件包的可执行文件
|
|
||||||
ssaudit <path> 使用 ssaudit 进行本地软件安装,详情见 spark-store
|
ssaudit <path> 使用 ssaudit 进行本地软件安装,详情见 spark-store
|
||||||
debug 显示调试系统信息并进入调试环境
|
debug 显示调试系统信息并进入调试环境
|
||||||
|
|
||||||
amber 彩蛋功能
|
amber 彩蛋功能
|
||||||
xmp360 彩蛋功能
|
xmp360 彩蛋功能
|
||||||
bronya 彩蛋功能
|
bronya 彩蛋功能
|
||||||
|
|
||||||
-h, --help 显示此帮助信息
|
-h, --help 显示此帮助信息
|
||||||
|
-v, --version 展示APM版本号
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
@@ -47,7 +54,11 @@ apm_exec(){
|
|||||||
local lowerdirs=()
|
local lowerdirs=()
|
||||||
local current_dir="${PATH_PREFIX}/var/lib/apm/${coredir}" # 当前目录开始
|
local current_dir="${PATH_PREFIX}/var/lib/apm/${coredir}" # 当前目录开始
|
||||||
local next_info_file=""
|
local next_info_file=""
|
||||||
|
if [[ "$APM_USE_SANDBOX" = "1" ]];then
|
||||||
|
APM_RUN_EXEC=/var/lib/apm/apm/files/ace-run-sandbox
|
||||||
|
else
|
||||||
|
APM_RUN_EXEC=/var/lib/apm/apm/files/ace-run
|
||||||
|
fi
|
||||||
while : ; do
|
while : ; do
|
||||||
# 构建info文件的路径
|
# 构建info文件的路径
|
||||||
next_info_file="${current_dir}/info"
|
next_info_file="${current_dir}/info"
|
||||||
@@ -99,7 +110,7 @@ apm_exec(){
|
|||||||
fuse-overlayfs -o lowerdir="$lowerdir",upperdir="${PATH_PREFIX}/var/lib/apm/${coredir}/files/core/",workdir="${PATH_PREFIX}/var/lib/apm/${coredir}/files/work/" "/tmp/apm/${coredir}"
|
fuse-overlayfs -o lowerdir="$lowerdir",upperdir="${PATH_PREFIX}/var/lib/apm/${coredir}/files/core/",workdir="${PATH_PREFIX}/var/lib/apm/${coredir}/files/work/" "/tmp/apm/${coredir}"
|
||||||
|
|
||||||
# 执行命令
|
# 执行命令
|
||||||
chrootEnvPath="/tmp/apm/${coredir}" /var/lib/apm/apm/files/ace-run "$@"
|
chrootEnvPath="/tmp/apm/${coredir}" ${APM_RUN_EXEC} "$@"
|
||||||
|
|
||||||
# 卸载
|
# 卸载
|
||||||
umount "/tmp/apm/${coredir}"
|
umount "/tmp/apm/${coredir}"
|
||||||
@@ -242,6 +253,18 @@ case "$1" in
|
|||||||
exit $exit_code
|
exit $exit_code
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
hold|unhold)
|
||||||
|
command=$1
|
||||||
|
shift
|
||||||
|
amber-pm-debug apt-mark "$command" "$@"
|
||||||
|
exit_code=$?
|
||||||
|
if [ $exit_code -eq 0 ]; then
|
||||||
|
log.info "Operation successful"
|
||||||
|
else
|
||||||
|
log.error "Error: Operation failed"
|
||||||
|
exit $exit_code
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
|
||||||
remove|autoremove|purge|autopurge)
|
remove|autoremove|purge|autopurge)
|
||||||
# 特殊APT命令:移除第一个参数后传递其余参数
|
# 特殊APT命令:移除第一个参数后传递其余参数
|
||||||
@@ -283,7 +306,7 @@ case "$1" in
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
coredir=$pkg
|
coredir=$pkg
|
||||||
|
export APM_PKG_NAME=$pkg
|
||||||
|
|
||||||
# 检测是否有额外命令参数
|
# 检测是否有额外命令参数
|
||||||
if [ $# -gt 0 ]; then
|
if [ $# -gt 0 ]; then
|
||||||
@@ -296,11 +319,18 @@ case "$1" in
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
sandbox-run)
|
||||||
|
# 运行包命令:第二个参数必须是包名
|
||||||
|
export APM_USE_SANDBOX=1
|
||||||
|
shift
|
||||||
|
$0 run "$@"
|
||||||
|
;;
|
||||||
debug)
|
debug)
|
||||||
debug_info
|
shift
|
||||||
|
debug_info $@
|
||||||
;;
|
;;
|
||||||
ssaudit)
|
ssaudit)
|
||||||
amber-pm-debug ssaudit "$@" --native
|
amber-pm-debug ssaudit $@ --native
|
||||||
exit_code=$?
|
exit_code=$?
|
||||||
if [ $exit_code -eq 0 ]; then
|
if [ $exit_code -eq 0 ]; then
|
||||||
log.info "Operation successful"
|
log.info "Operation successful"
|
||||||
@@ -315,6 +345,9 @@ case "$1" in
|
|||||||
-h|--help)
|
-h|--help)
|
||||||
show_help
|
show_help
|
||||||
;;
|
;;
|
||||||
|
-v|--version)
|
||||||
|
echo "$VERSION"
|
||||||
|
;;
|
||||||
amber)
|
amber)
|
||||||
amber_egg
|
amber_egg
|
||||||
;;
|
;;
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ After=apt-daily.service network.target network-online.target systemd-networkd.se
|
|||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=simple
|
||||||
RemainAfterExit=yes
|
RemainAfterExit=yes
|
||||||
ExecStart=bash -c "apm clean && apm update"
|
ExecStart=amber-pm-upgrade-notifier
|
||||||
Restart=on-failure
|
Restart=on-failure
|
||||||
RestartSec=10
|
RestartSec=10
|
||||||
|
|
||||||
|
|||||||
+11
@@ -0,0 +1,11 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Timer for APM Daily Update
|
||||||
|
|
||||||
|
[Timer]
|
||||||
|
# 开机后第一次执行
|
||||||
|
OnBootSec=1min
|
||||||
|
# 每天执行一次
|
||||||
|
OnUnitActiveSec=1d
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=timers.target
|
||||||
@@ -44,11 +44,14 @@ _apm()
|
|||||||
"update"
|
"update"
|
||||||
"upgrade" "full-upgrade" "dist-upgrade"
|
"upgrade" "full-upgrade" "dist-upgrade"
|
||||||
"run"
|
"run"
|
||||||
|
"sandbox-run"
|
||||||
"help"
|
"help"
|
||||||
"source" "build-dep"
|
"source" "build-dep"
|
||||||
"clean" "autoclean"
|
"clean" "autoclean"
|
||||||
"download" "changelog"
|
"download" "changelog"
|
||||||
"amber"
|
"amber"
|
||||||
|
"xmp360"
|
||||||
|
"bronya"
|
||||||
"debug"
|
"debug"
|
||||||
"depends" "rdepends"
|
"depends" "rdepends"
|
||||||
"policy")
|
"policy")
|
||||||
@@ -236,7 +239,7 @@ fi
|
|||||||
command grep "^Source: $cur" | sort -u | cut -f2 -d" " ) )
|
command grep "^Source: $cur" | sort -u | cut -f2 -d" " ) )
|
||||||
return 0
|
return 0
|
||||||
;;
|
;;
|
||||||
run)
|
run|sandbox-run)
|
||||||
COMPREPLY=( $( compgen -W "$(apm_run_compgen)" "$cur" ) )
|
COMPREPLY=( $( compgen -W "$(apm_run_compgen)" "$cur" ) )
|
||||||
return 0
|
return 0
|
||||||
;;
|
;;
|
||||||
|
|||||||
Executable
BIN
Binary file not shown.
|
After Width: | Height: | Size: 124 KiB |
Regular → Executable
|
Before Width: | Height: | Size: 124 KiB After Width: | Height: | Size: 124 KiB |
@@ -1,16 +1,41 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
bash(){
|
function bash(){
|
||||||
/usr/bin/bash --rcfile <(cat ~/.bashrc; echo "PS1=\"\[\e[37;40m\][\[\e[32;40m\]\u\[\e[37;40m\]@Amber-PM \[\e[36;40m\]\w\[\e[0m\]]\\\$ \"") $@
|
/usr/bin/bash --rcfile <(cat ~/.bashrc; echo "PS1=\"\[\e[37;40m\][\[\e[32;40m\]\u\[\e[37;40m\]@Amber-PM \[\e[36;40m\]\w\[\e[0m\]]\\\$ \"") $@
|
||||||
}
|
}
|
||||||
export -f bash
|
export -f bash
|
||||||
|
function ensure_dir() {
|
||||||
|
local dir="$1"
|
||||||
|
|
||||||
|
# 检查目录是否为空
|
||||||
|
if [ -z "$dir" ]; then
|
||||||
|
echo "错误: 目录路径不能为空"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 检查目录是否存在
|
||||||
|
if [ ! -d "$dir" ]; then
|
||||||
|
echo "目录 '$dir' 不存在,正在创建..."
|
||||||
|
if mkdir -p "$dir"; then
|
||||||
|
echo "成功创建目录 '$dir'"
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
echo "错误: 无法创建目录 '$dir'"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
}
|
||||||
chrootEnvPath="${chrootEnvPath:-$(pwd)/ace-env}"
|
chrootEnvPath="${chrootEnvPath:-$(pwd)/ace-env}"
|
||||||
|
|
||||||
|
APM_PKG_NAME="${APM_PKG_NAME:-apm-general}"
|
||||||
|
|
||||||
non_root_user=$(who | awk '{print $1}' | head -n 1)
|
non_root_user=$(who | awk '{print $1}' | head -n 1)
|
||||||
uid=$(id -u $non_root_user)
|
uid=$(id -u $non_root_user)
|
||||||
|
ensure_dir $HOME/.apm/${APM_PKG_NAME}/.deepinwine
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#### This part is for args pharm
|
#### This part is for args pharm
|
||||||
@@ -103,6 +128,7 @@ BIND_DIRS=(
|
|||||||
"--ro-bind-try /usr/share/fonts /usr/local/share/fonts"
|
"--ro-bind-try /usr/share/fonts /usr/local/share/fonts"
|
||||||
"--dev-bind-try /etc/resolv.conf /etc/resolv.conf"
|
"--dev-bind-try /etc/resolv.conf /etc/resolv.conf"
|
||||||
"--dev-bind-try /home /home"
|
"--dev-bind-try /home /home"
|
||||||
|
"--dev-bind-try $HOME/.apm/${APM_PKG_NAME}/.deepinwine $HOME/.deepinwine"
|
||||||
)
|
)
|
||||||
EXTRA_ARGS=(
|
EXTRA_ARGS=(
|
||||||
"--cap-add CAP_SYS_ADMIN"
|
"--cap-add CAP_SYS_ADMIN"
|
||||||
|
|||||||
Executable
+180
@@ -0,0 +1,180 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
function bash(){
|
||||||
|
/usr/bin/bash --rcfile <(cat ~/.bashrc; echo "PS1=\"\[\e[37;40m\][\[\e[32;40m\]\u\[\e[37;40m\]@Amber-PM \[\e[36;40m\]\w\[\e[0m\]]\\\$ \"") $@
|
||||||
|
}
|
||||||
|
export -f bash
|
||||||
|
function ensure_dir() {
|
||||||
|
local dir="$1"
|
||||||
|
|
||||||
|
# 检查目录是否为空
|
||||||
|
if [ -z "$dir" ]; then
|
||||||
|
echo "错误: 目录路径不能为空"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 检查目录是否存在
|
||||||
|
if [ ! -d "$dir" ]; then
|
||||||
|
echo "目录 '$dir' 不存在,正在创建..."
|
||||||
|
if mkdir -p "$dir"; then
|
||||||
|
echo "成功创建目录 '$dir'"
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
echo "错误: 无法创建目录 '$dir'"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
chrootEnvPath="${chrootEnvPath:-$(pwd)/ace-env}"
|
||||||
|
|
||||||
|
APM_PKG_NAME="${APM_PKG_NAME:-apm-general}"
|
||||||
|
|
||||||
|
non_root_user=$(who | awk '{print $1}' | head -n 1)
|
||||||
|
uid=$(id -u $non_root_user)
|
||||||
|
ensure_dir $HOME/.apm/${APM_PKG_NAME}/
|
||||||
|
ensure_dir $HOME/.apm/${APM_PKG_NAME}/$(basename $(xdg-user-dir DESKTOP))
|
||||||
|
ensure_dir $HOME/.apm/${APM_PKG_NAME}/$(basename $(xdg-user-dir DOCUMENTS))
|
||||||
|
ensure_dir $HOME/.apm/${APM_PKG_NAME}/$(basename $(xdg-user-dir PICTURES))
|
||||||
|
ensure_dir $HOME/.apm/${APM_PKG_NAME}/$(basename $(xdg-user-dir DOWNLOAD))
|
||||||
|
ensure_dir $HOME/.apm/${APM_PKG_NAME}/$(basename $(xdg-user-dir VIDEOS))
|
||||||
|
ensure_dir $HOME/.apm/${APM_PKG_NAME}/$(basename $(xdg-user-dir MUSIC))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#### This part is for args pharm
|
||||||
|
if [ "$1" = "" ];then
|
||||||
|
container_command="bash"
|
||||||
|
else
|
||||||
|
container_command="$1"
|
||||||
|
shift
|
||||||
|
for arg in "$@"; do
|
||||||
|
arg="$(echo "${arg}x" | sed 's|'\''|'\'\\\\\'\''|g')"
|
||||||
|
arg="${arg%x}"
|
||||||
|
container_command="${container_command} '${arg}'"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
#########################################################################################
|
||||||
|
##########合成bwrap 1. 基础函数配置段
|
||||||
|
# 初始化 EXEC_COMMAND 为 bwrap 基础指令
|
||||||
|
EXEC_COMMAND="bwrap --dev-bind / / bwrap"
|
||||||
|
|
||||||
|
# add_command 函数定义
|
||||||
|
function add_command() {
|
||||||
|
# 参数拼接,考虑到转义和空格的处理
|
||||||
|
for arg in "$@"; do
|
||||||
|
EXEC_COMMAND="${EXEC_COMMAND} ${arg}"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
function add_env_var() {
|
||||||
|
local var_name="${1}"
|
||||||
|
local var_value="${2}"
|
||||||
|
if [ "$var_value" != "" ]; then
|
||||||
|
add_command "--setenv $var_name $var_value"
|
||||||
|
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
##########合成bwrap 2. 特殊需求函数配置段
|
||||||
|
function cursor_theme_dir_integration() {
|
||||||
|
|
||||||
|
local directory=""
|
||||||
|
if [ "$(id -u)" = "0" ]; then #####We don't want bother root to install themes,but will try to fix the unwriteable issue
|
||||||
|
mkdir -p $chrootEnvPath/usr/share/icons
|
||||||
|
chmod 777 -R $chrootEnvPath/usr/share/icons
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
for directory in "/usr/share/icons"/*; do
|
||||||
|
# 检查是否为目录
|
||||||
|
if [ -d "$directory" ]; then
|
||||||
|
# 检查目录中是否存在 cursors 文件
|
||||||
|
if [ -d "$directory/cursors" ]; then
|
||||||
|
if [ -w $chrootEnvPath/usr/share/icons ];then
|
||||||
|
add_command "--ro-bind-try $directory $directory"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
##########合成bwrap 3. 环境变量和目录绑定配置段
|
||||||
|
# 添加环境变量和其他初始设置
|
||||||
|
ENV_VARS=(
|
||||||
|
"FAKEROOTDONTTRYCHOWN 1"
|
||||||
|
"PULSE_SERVER /run/user/\$uid/pulse/native"
|
||||||
|
"PATH /amber-ce-tools/bin-override:\$PATH"
|
||||||
|
"IS_ACE_ENV 1"
|
||||||
|
"GTK_USE_PORTAL 1"
|
||||||
|
"XDG_DATA_DIRS /amber-ce-tools/additional-data-dir-in-container:\$XDG_DATA_DIRS"
|
||||||
|
)
|
||||||
|
|
||||||
|
BIND_DIRS=(
|
||||||
|
"--dev-bind $chrootEnvPath/ /"
|
||||||
|
"--dev-bind-try /media /media"
|
||||||
|
"--dev-bind-try /mnt /mnt"
|
||||||
|
"--dev-bind-try /tmp /tmp"
|
||||||
|
"--dev-bind-try /data /data"
|
||||||
|
"--dev-bind-try /dev /dev"
|
||||||
|
"--proc /proc"
|
||||||
|
"--dev-bind /sys /sys"
|
||||||
|
"--dev-bind /run /run"
|
||||||
|
"--dev-bind-try /run/user/\$uid/pulse /run/user/\$uid/pulse"
|
||||||
|
"--dev-bind / /host"
|
||||||
|
"--ro-bind-try /usr/share/themes /usr/local/share/themes"
|
||||||
|
"--ro-bind-try /usr/share/icons /usr/share/icons"
|
||||||
|
"--ro-bind-try /usr/share/fonts /usr/local/share/fonts"
|
||||||
|
"--dev-bind-try /etc/resolv.conf /etc/resolv.conf"
|
||||||
|
"--dev-bind-try /home /home"
|
||||||
|
"--dev-bind-try $HOME/.apm/${APM_PKG_NAME}/ $HOME/"
|
||||||
|
"--dev-bind-try $(xdg-user-dir DESKTOP) $(xdg-user-dir DESKTOP)"
|
||||||
|
"--dev-bind-try $(xdg-user-dir DOCUMENTS) $(xdg-user-dir DOCUMENTS)"
|
||||||
|
"--dev-bind-try $(xdg-user-dir PICTURES) $(xdg-user-dir PICTURES)"
|
||||||
|
"--dev-bind-try $(xdg-user-dir DOWNLOAD) $(xdg-user-dir DOWNLOAD)"
|
||||||
|
"--dev-bind-try $(xdg-user-dir VIDEOS) $(xdg-user-dir VIDEOS)"
|
||||||
|
"--dev-bind-try $(xdg-user-dir MUSIC) $(xdg-user-dir MUSIC)"
|
||||||
|
)
|
||||||
|
EXTRA_ARGS=(
|
||||||
|
"--cap-add CAP_SYS_ADMIN"
|
||||||
|
)
|
||||||
|
|
||||||
|
EXTRA_SCRIPTS=(
|
||||||
|
# cursor_theme_dir_integration
|
||||||
|
)
|
||||||
|
|
||||||
|
##########合成bwrap 4. 合成并执行指令
|
||||||
|
# 逐一添加到 EXEC_COMMAND
|
||||||
|
for var in "${ENV_VARS[@]}"; do
|
||||||
|
add_env_var $var
|
||||||
|
done
|
||||||
|
|
||||||
|
for var in "${BIND_DIRS[@]}"; do
|
||||||
|
add_command "$var"
|
||||||
|
done
|
||||||
|
|
||||||
|
for var in "${EXTRA_ARGS[@]}"; do
|
||||||
|
add_command "$var"
|
||||||
|
done
|
||||||
|
|
||||||
|
for var in "${EXTRA_SCRIPTS[@]}"; do
|
||||||
|
$var
|
||||||
|
done
|
||||||
|
|
||||||
|
# 添加最终的 bash 命令
|
||||||
|
add_command "bash -c \"${container_command}\""
|
||||||
|
|
||||||
|
# 输出完整的 EXEC_COMMAND 以查看
|
||||||
|
# echo "${EXEC_COMMAND}"
|
||||||
|
|
||||||
|
# 注意: 实际执行时,请确保所有变量(如 $uid, $chrootEnvPath 等)都已正确定义
|
||||||
|
eval ${EXEC_COMMAND}
|
||||||
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user