Compare commits

..

19 Commits

Author SHA1 Message Date
shenmo7192 0611165355 update src/usr/bin/amber-pm-convert.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2026-03-26 13:15:58 +00:00
shenmo7192 bdd5ced484 修复无法使用 Steam 的问题
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2026-03-26 13:06:19 +00:00
shenmo7192 2ac48801ce Merge remote-tracking branch 'refs/remotes/origin/master' 2026-03-26 20:27:20 +08:00
shenmo7192 d4bb5239ba 更新:安装后会创建 /host 来适配 APM 特殊需求 2026-03-26 20:26:49 +08:00
shenmo7192 e0f691f35f 安装软件后刷新 mimetype ,修复 WPS 丢文件类型的问题
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2026-03-25 15:31:44 +00:00
shenmo7192 bdc123ba6f update src/var/lib/apm/apm/files/bin/ace-init.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2026-03-25 15:23:14 +00:00
shenmo7192 e95adb8263 update src/usr/bin/amber-pm-app-uninstaller.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2026-03-25 15:12:19 +00:00
shenmo7192 8e50f721f1 添加卸载完成提示 2026-03-25 19:49:55 +08:00
shenmo7192 e5933373d7 支持在deepin下右键卸载 2026-03-25 19:42:26 +08:00
shenmo7192 e1070820ee 现在支持在deepin下右键卸载 2026-03-25 19:41:38 +08:00
shenmo7192 cc3e3c9c12 修复不能正确重命名文件的问题 2026-03-25 18:57:20 +08:00
shenmo7192 4d7aa499f0 在检测更新时清理cache 2026-03-25 18:23:40 +08:00
shenmo7192 8ad48ab51a update: 现在convert的时候会重命名.dpkg-new而不是删除 2026-03-25 18:21:32 +08:00
shenmo7192 da00f49a2e update src/usr/bin/amber-pm-convert.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2026-03-15 13:08:49 +00:00
shenmo7192 c71679a23d 修复 安装异常时 卡住dpkg 的问题 2026-03-15 12:13:01 +08:00
shenmo7192 c0494c640b 新增 apm launch 相关自动补全能力 2026-03-15 12:05:06 +08:00
shenmo7192 b7c9797ef1 apm launch 会在当前进程启动,而不是在新的 2026-03-15 12:01:18 +08:00
shenmo7192 844eed8a3d apm run 支持自动启动,新增 apm launch ,1.1.8 2026-03-15 11:58:18 +08:00
shenmo7192 c69ab42228 fix: 首次从星火安装APM包的时候无法正确配置桌面快捷方式
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2026-03-15 02:17:19 +00:00
14 changed files with 393 additions and 124 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
Package: apm Package: apm
Version: 1.1.2 Version: 1.1.3
Maintainer: shenmo <jifengshenmo@outlook.com> Maintainer: shenmo <jifengshenmo@outlook.com>
Priority: optional Priority: optional
Section: utils Section: utils
+19 -16
View File
@@ -1,9 +1,5 @@
#!/bin/bash #!/bin/bash
enumAppInfoList() { enumAppInfoList() {
appInfoList=() appInfoList=()
apps="/var/lib/apm" apps="/var/lib/apm"
@@ -13,6 +9,7 @@ enumAppInfoList() {
done done
echo "${appInfoList[@]}" echo "${appInfoList[@]}"
} }
linkDir() { linkDir() {
ensureTargetDir() { ensureTargetDir() {
targetFile=$1 targetFile=$1
@@ -26,8 +23,6 @@ linkDir() {
targetDir=$(dirname "$target") targetDir=$(dirname "$target")
find "$source" -type f | while read sourceFile; do find "$source" -type f | while read sourceFile; do
targetFile="$targetDir/${sourceFile#$sourceDir/}" targetFile="$targetDir/${sourceFile#$sourceDir/}"
ensureTargetDir "$targetFile" ensureTargetDir "$targetFile"
sourceFile=$(realpath --relative-to="$(dirname $targetFile)" "$sourceFile" ) sourceFile=$(realpath --relative-to="$(dirname $targetFile)" "$sourceFile" )
if [ ! -e "${targetFile}" ];then if [ ! -e "${targetFile}" ];then
@@ -36,7 +31,6 @@ linkDir() {
done done
} }
linkApp() { linkApp() {
appID=$1 appID=$1
appEntriesDir="/var/lib/apm/$appID/entries" appEntriesDir="/var/lib/apm/$appID/entries"
@@ -53,6 +47,21 @@ linkApp() {
if [ ! -d "$folder" ]; then if [ ! -d "$folder" ]; then
continue continue
fi fi
# 对于 applications 目录,先为所有 .desktop 文件添加必要的字段
if [ "$folder" = "$appEntriesDir/applications" ]; then
find "$folder" -name "*.desktop" -type f | while read desktop; do
# 添加 X-APM-APPID
if ! grep -q "^X-APM-APPID=" "$desktop"; then
echo "X-APM-APPID=$appID" >> "$desktop"
fi
# 添加 X-Deepin-PreUninstall
if ! grep -q "^X-Deepin-PreUninstall=" "$desktop"; then
echo "X-Deepin-PreUninstall=amber-pm-app-uninstaller $appID" >> "$desktop"
fi
done
fi
if [ "$folder" = "$appEntriesDir/polkit" ]; then if [ "$folder" = "$appEntriesDir/polkit" ]; then
linkDir "$folder" "/usr/share/polkit-1" linkDir "$folder" "/usr/share/polkit-1"
elif [ "$folder" = "$appEntriesDir/fonts/conf" ]; then elif [ "$folder" = "$appEntriesDir/fonts/conf" ]; then
@@ -64,10 +73,8 @@ linkApp() {
} }
function exec_uos_package_link(){ function exec_uos_package_link(){
for app in $(enumAppInfoList); do for app in $(enumAppInfoList); do
linkApp "$app" & linkApp "$app" &
done done
wait wait
} }
@@ -89,7 +96,6 @@ done
function exec_link_clean(){ function exec_link_clean(){
# remove broken links in /usr/share # remove broken links in /usr/share
find /usr/share/applications -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null & find /usr/share/applications -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null &
find /usr/share/icons -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null & find /usr/share/icons -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null &
find /usr/share/mime/packages -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null & find /usr/share/mime/packages -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null &
@@ -98,20 +104,17 @@ function exec_link_clean(){
find /usr/share/fcitx -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null & find /usr/share/fcitx -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null &
find /usr/share/help -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null & find /usr/share/help -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null &
find /usr/share/locale -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null & find /usr/share/locale -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null &
# find /usr/lib/$(gcc -dumpmachine)/fcitx -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null &
find /usr/lib/mozilla/plugins -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null & find /usr/lib/mozilla/plugins -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null &
find /usr/share/polkit-1/actions -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null & find /usr/share/polkit-1/actions -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null &
find /usr/share/fonts -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null & find /usr/share/fonts -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null &
find /etc/fonts/conf.d -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null & find /etc/fonts/conf.d -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink {} \; 2>/dev/null &
} }
function exec_uos_package_update(){ function exec_uos_package_update(){
update-icon-caches /usr/share/icons/* > /dev/null 2>&1 & update-icon-caches /usr/share/icons/* > /dev/null 2>&1 &
update-desktop-database -q > /dev/null 2>&1 & update-desktop-database -q > /dev/null 2>&1 &
update-mime-database -V /usr/share/mime > /dev/null 2>&1 & update-mime-database -V /usr/share/mime > /dev/null 2>&1 &
glib-compile-schemas /usr/share/glib-2.0/schemas/ > /dev/null 2>&1 & glib-compile-schemas /usr/share/glib-2.0/schemas/ > /dev/null 2>&1 &
} }
function exec_debian_compatibile_links(){ function exec_debian_compatibile_links(){
@@ -156,13 +159,13 @@ for link in "$TARGET_DIR"/*; do
fi fi
done done
} }
######################################################################################### #########################################################################################
echo "----------------Running APM Dstore Patch----------------" echo "----------------Running APM Dstore Patch----------------"
# execute linkApp function for each app and print output # 执行链接操作(同时完成 .desktop 字段添加)
exec_uos_package_link exec_uos_package_link
# exec_v23_icon_link # exec_v23_icon_link
exec_link_clean exec_link_clean
wait wait
+1 -1
View File
@@ -1 +1 @@
@VERSION@=1.1.7 @VERSION@=1.1.9
+1 -1
View File
@@ -4,7 +4,7 @@ Version: @VERSION@
Architecture: amd64 Architecture: amd64
Maintainer: shenmo <shenmo@spark-app.store> Maintainer: shenmo <shenmo@spark-app.store>
Installed-Size: 49000 Installed-Size: 49000
Depends: bubblewrap, flatpak, policykit-1 | pkexec | polkit-1 | polkit, systemd, procps,coreutils,fuse-overlayfs,xz-utils | xz,libnotify-bin,curl,xdg-user-dirs,bash Depends: zenity | garma,bubblewrap, flatpak, policykit-1 | pkexec | polkit-1 | polkit, systemd, procps,coreutils,fuse-overlayfs,xz-utils | xz,libnotify-bin,curl,xdg-user-dirs,bash
Recommends: dpkg, fakeroot, busybox Recommends: dpkg, fakeroot, busybox
Section: misc Section: misc
Conflicts: ace-host-integration Conflicts: ace-host-integration
+2 -1
View File
@@ -15,7 +15,8 @@ systemctl restart apparmor.service || true
fi fi
# Send statistics data # Send statistics data
/var/lib/apm/apm/files/feedback.sh & /var/lib/apm/apm/files/feedback.sh &
ln -sv ../ /host
amber-pm-dstore-patch
;; ;;
triggered) triggered)
+84
View File
@@ -0,0 +1,84 @@
#!/bin/bash
# ===== 日志函数(简化版)=====
log.info() { echo "INFO: $*"; }
log.warn() { echo "WARN: $*"; }
log.error() { echo "ERROR: $*"; }
log.debug() { :; } # APM 场景下可禁用 debug 日志
# ===== APM 专用桌面文件扫描(单文件)=====
function scan_apm_desktop_log() {
unset desktop_file_path
local pkg_name="$1"
local desktop_dir="/var/lib/apm/apm/files/ace-env/var/lib/apm/${pkg_name}/entries/applications"
[ -d "$desktop_dir" ] || return 1
while IFS= read -r -d '' path; do
[ -f "$path" ] || continue
if ! grep -q 'NoDisplay=true' "$path" 2>/dev/null; then
log.info "Found valid APM desktop file: $path"
export desktop_file_path="$path"
return 0
fi
done < <(find "$desktop_dir" -name "*.desktop" -type f -print0 2>/dev/null)
return 1
}
# ===== APM 专用桌面文件扫描(多文件列表)=====
function scan_apm_desktop_list() {
local pkg_name="$1"
local desktop_dir="/var/lib/apm/apm/files/ace-env/var/lib/apm/${pkg_name}/entries/applications"
local result=""
[ -d "$desktop_dir" ] || { echo ""; return; }
while IFS= read -r -d '' path; do
[ -f "$path" ] || continue
if ! grep -q 'NoDisplay=true' "$path" 2>/dev/null; then
result+="${path},"
fi
done < <(find "$desktop_dir" -name "*.desktop" -type f -print0 2>/dev/null)
echo "${result%,}"
}
# ===== 启动应用 =====
function launch_app() {
local desktop_path="${1#file://}"
local exec_cmd
shift # 移除第一个参数(desktop_path),剩余的是要传递给应用的参数
# 提取并清理 Exec 行(移除字段代码如 %f %u 等)
exec_cmd=$(grep -m1 '^Exec=' "$desktop_path" | cut -d= -f2- | sed 's/%[fFuUdDnNickvm]*//g; s/^[[:space:]]*//; s/[[:space:]]*$//')
[ -z "$exec_cmd" ] && return 1
# 如果有额外参数,添加到命令中
if [ $# -gt 0 ]; then
log.info "Launching with arguments: $*"
exec_cmd="$exec_cmd $*"
fi
log.info "Launching: $exec_cmd"
${SHELL:-bash} -c "$exec_cmd"
}
# 导出函数供 ACE 环境调用
export -f launch_app scan_apm_desktop_log scan_apm_desktop_list log.info log.error
# ===== 主逻辑 =====
[ $# -lt 1 ] && {
log.error "Usage: $0 <apm-package-name> [additional arguments...]"
exit 1
}
pkg_name="$1"
shift # 移除包名参数,剩余的都是要传递给应用的参数
# 直接执行 launch 逻辑,并将剩余参数传递给 launch_app
if scan_apm_desktop_log "$pkg_name" && launch_app "$desktop_file_path" "$@"; then
exit 0
else
exit 1
fi
+52
View File
@@ -0,0 +1,52 @@
#!/bin/bash
# ===== Log =====
log.warn() { echo -e "[\e[33mWARN\e[0m]: \e[1m$*\e[0m"; }
log.error() { echo -e "[\e[31mERROR\e[0m]: \e[1m$*\e[0m"; }
log.info() { echo -e "[\e[96mINFO\e[0m]: \e[1m$*\e[0m"; }
log.debug() { echo -e "[\e[32mDEBUG\e[0m]: \e[1m$*\e[0m"; }
# 获取原始用户(调用 pkexec 或 sudo 的用户)
ORIGINAL_USER="${SUDO_USER:-$USER}"
ORIGINAL_UID=$(id -u "$ORIGINAL_USER")
ORIGINAL_DISPLAY="${DISPLAY:-:0}"
ORIGINAL_XAUTHORITY="${XAUTHORITY:-$HOME/.Xauthority}"
# 以原始用户身份运行图形界面命令
function run_as_user() {
sudo -u "$ORIGINAL_USER" DISPLAY="$ORIGINAL_DISPLAY" XAUTHORITY="$ORIGINAL_XAUTHORITY" "$@"
}
function zenity() {
if [[ -e /usr/bin/garma ]]; then
run_as_user garma "$@"
else
run_as_user "$(command -v zenity)" "$@"
fi
}
function notify-send() {
local uid="$ORIGINAL_UID"
sudo -u "$ORIGINAL_USER" DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/${uid}/bus" zenity --notification --text="$@"
}
# 如果当前不是 root,则用 pkexec 重新执行并传递必要的环境变量
if [ "$UID" != "0" ]; then
# 保存当前环境变量,通过 env 传递给 pkexec
exec pkexec "$0" "$@"
exit $?
fi
# 用户确认
if zenity --question --text="即将卸载 $1\n请确认" --no-wrap; then
# 启动卸载命令(这里假设 apm 是系统命令,请根据实际情况调整)
# 注意:apm 可能不存在,可替换为 apt、dnf 等
apm autoremove "$1" -y
ret=$?
fi
notify-send "卸载完成"
+5 -3
View File
@@ -646,14 +646,16 @@ fi
sudo -E chrootEnvPath="$chrootEnvPath" /var/lib/apm/apm/files/ace-run-pkg aptss clean || true sudo -E chrootEnvPath="$chrootEnvPath" /var/lib/apm/apm/files/ace-run-pkg aptss clean || true
sudo -E chrootEnvPath="$chrootEnvPath" /var/lib/apm/apm/files/ace-run-pkg rm -vfr /var/lib/apt/lists || true sudo -E chrootEnvPath="$chrootEnvPath" /var/lib/apm/apm/files/ace-run-pkg rm -vfr /var/lib/apt/lists || true
sudo -E chrootEnvPath="$chrootEnvPath" /var/lib/apm/apm/files/ace-run-pkg rm -vfr /var/lib/aptss/lists || true sudo -E chrootEnvPath="$chrootEnvPath" /var/lib/apm/apm/files/ace-run-pkg rm -vfr /var/lib/aptss/lists || true
sudo -E chrootEnvPath="$chrootEnvPath" /var/lib/apm/apm/files/ace-run-pkg rm -vfr /var/cache/apt/* || true sudo -E chrootEnvPath="$chrootEnvPath" /var/lib/apm/apm/files/ace-run-pkg rm -vfr /var/cache/apt/archives/* || true
#清理 .dpkg-new 文件 #清理 .dpkg-new 文件
log.info "搜索并清理 .dpkg-new 文件..." log.info "搜索并清理 .dpkg-new 文件..."
# 在 core 目录下查找并删除所有以 .dpkg-new 结尾的文件 # 在 core 目录下查找并删除所有以 .dpkg-new 结尾的文件
# 删除 .dpkg-new 文件(去掉后缀)
log.info "删除 .dpkg-new 文件.."
find "$CRAFT_DIR/core" -name "*.dpkg-new" 2>/dev/null | while read -r file; do find "$CRAFT_DIR/core" -name "*.dpkg-new" 2>/dev/null | while read -r file; do
log.info "删除: $file"
sudo rm -f "$file" sudo rm -vf "$file"
done done
# 统计清理结果 # 统计清理结果
+1 -1
View File
@@ -100,7 +100,7 @@ until ! echo $updatetext | grep -q "E:"; do
updatetext=$(LANGUAGE=en_US apm update 2>&1) updatetext=$(LANGUAGE=en_US apm update 2>&1)
retry_count=$((retry_count + 1)) retry_count=$((retry_count + 1))
done done
apm clean
update_app_number=$(env LANGUAGE=en_US apm list --upgradable 2>/dev/null | grep -c upgradable) update_app_number=$(env LANGUAGE=en_US apm list --upgradable 2>/dev/null | grep -c upgradable)
echo "update_app_number is $update_app_number" echo "update_app_number is $update_app_number"
+61 -8
View File
@@ -21,9 +21,10 @@ Usage:
Commands: Commands:
install 安装软件包 install 安装软件包
remove 卸载软件包 remove 卸载软件包
run <package> 运行指定软件包的可执行文件 launch <package> [args...] 启动软件包(通过应用启动器)
sandbox-run <package> 运行指定软件包的可执行文件(主目录沙箱化 run <package> [EXEC_PATH] [args...] 运行指定软件包的可执行文件(可指定容器内路径
bwrap-run <package> 运行指定软件包的可执行文件(使用特殊的挂载参数以支持bwrap sandbox-run <package> [EXEC_PATH] [args...] 运行指定软件包的可执行文件(主目录沙箱化
bwrap-run <package> [EXEC_PATH] [args...] 运行指定软件包的可执行文件(使用特殊的挂载参数以支持bwrap)
update 更新软件包信息 update 更新软件包信息
hold 锁定软件包版本 hold 锁定软件包版本
@@ -195,8 +196,34 @@ apm_exec(){
umount "/tmp/apm/${coredir}" umount "/tmp/apm/${coredir}"
} }
# 启动应用:通过 amber-pm-app-launcher 运行
apm_launch() {
local pkg="$1"
shift
if [ -z "$pkg" ]; then
log.error "Package name required for 'launch' command"
return 1
fi
# 保存原始 PATH_PREFIX,检查包是否存在(逻辑同 run 分支)
local original_path_prefix="$PATH_PREFIX"
if ! [ -d "${PATH_PREFIX}/var/lib/apm/$pkg" ]; then
if [ -d "/var/lib/apm/$pkg" ]; then
PATH_PREFIX=""
else
log.error "Package not installed: $pkg"
return 1
fi
fi
# 调用应用启动器,传递所有参数
amber-pm-app-launcher "$pkg" "$@"
local exit_code=$?
# 恢复 PATH_PREFIX(不影响后续命令)
PATH_PREFIX="$original_path_prefix"
return $exit_code
}
# 调试信息函数 # 调试信息函数
debug_info() { debug_info() {
@@ -234,11 +261,11 @@ bronya_egg() {
cat <<'EOF' cat <<'EOF'
_ __ ____ _ ____ __ _ __ ____ _ ____ __
| | / /__ _/ / /____ ______(_)__ / __/_ _____ / /____ __ _ | | / /__ _/ / /____ ______(_)__ / __/_ _____ / /____ __ _
| |/ / _ `/ / '_/ // / __/ / -_) _\ \/ // (_-</ __/ -_) ' \ | |/ / _ `/ / '_/ // / __/ / _-) _\ \/ // (_-</ __/ -_) ' \
|___/\_,_/_/_/\_\\_, /_/ /_/\__/ /___/\_, /___/\__/\__/_/_/_/ |___/\_,_/_/_/\_\\_, /_/ /_/\__/ /___/\_, /___/\__/\__/_/_/_/
/ / ___ ___ __/___/____/ / /___/ / / ___ ___ __/___/____/ / /___/
/ /__/ _ `/ // / _ \/ __/ _ \ / /__/ _ `/ // / _ \/ __/ _ \
/____/\_,_/\_,_/_//_/\__/_//_/ /____/\_,_/_,_/_//_/\__/_//_/
Valkyrie 系统启动 - 重装小兔,Fire! Valkyrie 系统启动 - 重装小兔,Fire!
💎 感谢 Anysets 为 AmberCE 和 AmberPM 的 Arch 架构支持提供帮助~ 💎 感谢 Anysets 为 AmberCE 和 AmberPM 的 Arch 架构支持提供帮助~
@@ -303,6 +330,7 @@ for dir in "$APM_BASE"/*/; do
fi fi
done done
} }
# 主命令处理 # 主命令处理
case "$1" in case "$1" in
install|full-upgrade|upgrade|reinstall) install|full-upgrade|upgrade|reinstall)
@@ -310,6 +338,16 @@ case "$1" in
shift shift
amber-pm-debug aptss "$command" "$@" amber-pm-debug aptss "$command" "$@"
exit_code=$? exit_code=$?
# 如果第一次执行失败,尝试修复并重试
if [ $exit_code -ne 0 ]; then
log.warn "Command failed, attempting to fix with dpkg --configure -a..."
amber-pm-debug dpkg --configure -a
log.info "Retrying $command..."
amber-pm-debug aptss "$command" "$@"
exit_code=$?
fi
if [ $exit_code -eq 0 ]; then if [ $exit_code -eq 0 ]; then
log.info "Operation successful" log.info "Operation successful"
else else
@@ -319,6 +357,7 @@ case "$1" in
amber-pm-debug amber-pm-dstore-patch amber-pm-debug amber-pm-dstore-patch
apm-nvidia-toggle apm-nvidia-toggle
amber-pm-gxde-desktop-fix amber-pm-gxde-desktop-fix
update-mime-database /var/lib/apm/apm/files/ace-env/amber-ce-tools/data-dir/mime > /dev/null 2>&1 &
;; ;;
download|search|policy|list|update|clean|show|depends|rdepends|changelog|moo) download|search|policy|list|update|clean|show|depends|rdepends|changelog|moo)
command=$1 command=$1
@@ -360,6 +399,17 @@ case "$1" in
amber-pm-debug amber-pm-dstore-patch amber-pm-debug amber-pm-dstore-patch
amber-pm-gxde-desktop-fix amber-pm-gxde-desktop-fix
;; ;;
launch)
shift
apm_launch "$@"
exit_code=$?
if [ $exit_code -eq 0 ]; then
log.info "Operation successful"
else
log.error "Error: Operation failed"
exit $exit_code
fi
;;
run) run)
# 运行包命令:第二个参数必须是包名 # 运行包命令:第二个参数必须是包名
if [ -z "$2" ]; then if [ -z "$2" ]; then
@@ -393,9 +443,11 @@ case "$1" in
log.info "Running user command: $*" log.info "Running user command: $*"
apm_exec "$@" apm_exec "$@"
else else
# 没有额外参数:提示 # 没有额外参数:提示用户改用 launch,并自动调用 launch
log.info "Usage: $SCRIPT_NAME run $pkg [EXEC_PATH]" log.info "未指定可执行文件路径。如果希望在未指定容器路径的情况下启动应用程序,推荐使用 "launch" 命令"
exit 1 log.info "正在启动:$SCRIPT_NAME launch $pkg"
apm_launch "$pkg"
exit $?
fi fi
;; ;;
sandbox-run) sandbox-run)
@@ -415,6 +467,7 @@ case "$1" in
debug_info $@ debug_info $@
;; ;;
ssaudit) ssaudit)
amber-pm-debug dpkg --configure -a
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
+62 -6
View File
@@ -37,6 +37,7 @@ _apm()
# see if the user selected a command already # see if the user selected a command already
local COMMANDS=( local COMMANDS=(
"ssaudit" "ssaudit"
"launch"
"list" "list"
"search" "search"
"show" "showsrc" "show" "showsrc"
@@ -185,7 +186,7 @@ find_directories_without_ace_env() {
# 查找所有直接子目录,排除包含ace-env子目录的目录 # 查找所有直接子目录,排除包含ace-env子目录的目录
while IFS= read -r -d '' dir; do while IFS= read -r -d '' dir; do
if [[ -d "$dir" ]] && [[ ! -d "$dir/files/ace-env" ]]; then if [[ -d "$dir" ]] && [[ ! -d "$dir/files/ace-env" ]]; then
result+=("$(basename $dir)") result+=("$(basename "$dir")")
fi fi
done < <(find "$base_dir" -maxdepth 1 -type d ! -path "$base_dir" -print0 2>/dev/null) done < <(find "$base_dir" -maxdepth 1 -type d ! -path "$base_dir" -print0 2>/dev/null)
@@ -196,6 +197,7 @@ find_directories_without_ace_env() {
fi fi
return 1 return 1
} }
function apm_run_compgen(){ function apm_run_compgen(){
result=$(find_directories_without_ace_env "$primary_dir") result=$(find_directories_without_ace_env "$primary_dir")
@@ -210,38 +212,92 @@ else
fi fi
fi fi
} }
# 获取当前命令的参数位置
get_arg_position() {
local cmd="$1"
local pos=0
local found_cmd=0
for (( i=1; i < ${#words[@]}; i++ )); do
if [[ $found_cmd -eq 0 ]]; then
if [[ "${words[i]}" == "$cmd" ]]; then
found_cmd=1
fi
else
# 跳过选项参数(以-开头)
if [[ "${words[i]}" != -* ]]; then
((pos++))
fi
fi
done
echo $pos
}
# specific command arguments # specific command arguments
if [[ -n $command ]]; then if [[ -n $command ]]; then
# 获取参数位置
local arg_pos=$(get_arg_position "$command")
case $command in case $command in
remove|purge|autoremove) remove|purge|autoremove)
# Debian system # 第一个参数匹配包名
if [[ $arg_pos -eq 1 ]]; then
COMPREPLY=( $( compgen -W "$(ls /var/lib/apm/apm/files/ace-env/var/lib/apm/ )" "$cur" ) )
COMPREPLY=( $( compgen -W "$(ls /var/lib/apm/apm/files/ace-env/var/lib/apm/ )" $cur ) ) fi
return 0 return 0
;; ;;
show|list|download|changelog|depends|rdepends) show|list|download|changelog|depends|rdepends)
# 第一个参数匹配包名
if [[ $arg_pos -eq 1 ]]; then
COMPREPLY=( $( amber-pm-debug apt-cache --no-generate pkgnames "$cur" -o Dir::Cache="/var/lib/aptss/" \ COMPREPLY=( $( amber-pm-debug apt-cache --no-generate pkgnames "$cur" -o Dir::Cache="/var/lib/aptss/" \
2> /dev/null ) ) 2> /dev/null ) )
fi
return 0 return 0
;; ;;
install) install)
# 第一个参数匹配包名
if [[ $arg_pos -eq 1 ]]; then
COMPREPLY=( $( amber-pm-debug apt-cache --no-generate pkgnames "$cur" -o Dir::Cache="/var/lib/aptss/" \ COMPREPLY=( $( amber-pm-debug apt-cache --no-generate pkgnames "$cur" -o Dir::Cache="/var/lib/aptss/" \
2> /dev/null ) ) 2> /dev/null ) )
if [[ "$cur" == ./* || "$cur" == /* ]]; then if [[ "$cur" == ./* || "$cur" == /* ]]; then
_filedir "deb" _filedir "deb"
fi fi
fi
return 0 return 0
;; ;;
source|build-dep|showsrc|policy) source|build-dep|showsrc|policy)
# 第一个参数匹配包名
if [[ $arg_pos -eq 1 ]]; then
COMPREPLY=( $( amber-pm-debug apt-cache --no-generate pkgnames "$cur" -o Dir::Cache="/var/lib/aptss/" \ COMPREPLY=( $( amber-pm-debug apt-cache --no-generate pkgnames "$cur" -o Dir::Cache="/var/lib/aptss/" \
2> /dev/null ) $( apt-cache dumpavail -o Dir::Cache="/var/lib/aptss/" | \ 2> /dev/null ) $( apt-cache dumpavail -o Dir::Cache="/var/lib/aptss/" | \
command grep "^Source: $cur" | sort -u | cut -f2 -d" " ) ) command grep "^Source: $cur" | sort -u | cut -f2 -d" " ) )
fi
return 0 return 0
;; ;;
run|sandbox-run|bwrap-run) run|sandbox-run|bwrap-run)
# 第一个参数匹配包名
if [[ $arg_pos -eq 1 ]]; then
COMPREPLY=( $( compgen -W "$(apm_run_compgen)" "$cur" ) ) COMPREPLY=( $( compgen -W "$(apm_run_compgen)" "$cur" ) )
# 第二个及以后参数匹配文件
elif [[ $arg_pos -ge 2 ]]; then
_filedir
fi
return 0
;;
launch)
# 第一个参数匹配包名
if [[ $arg_pos -eq 1 ]]; then
COMPREPLY=( $( compgen -W "$(apm_run_compgen)" "$cur" ) )
# 第二个及以后参数匹配文件
elif [[ $arg_pos -ge 2 ]]; then
_filedir
fi
return 0
;;
ssaudit)
# ssaudit 命令总是匹配文件
_filedir
return 0 return 0
;; ;;
esac esac
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
<policyconfig>
<vendor>Flamescion</vendor>
<icon_name>x-package-repository</icon_name>
<action id="store.spark-app.apm-uninstaller">
<description>运行justinstallme需要权限</description>
<message>要使用ssinstall需要权限</message>
<defaults>
<allow_any>yes</allow_any>
<allow_inactive>yes</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/amber-pm-app-uninstaller</annotate>
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
</action>
</policyconfig>
+6 -7
View File
@@ -61,7 +61,7 @@ fi
######################################################################################### #########################################################################################
##########合成bwrap 1. 基础函数配置段 ##########合成bwrap 1. 基础函数配置段
# 初始化 EXEC_COMMAND 为 bwrap 基础指令 # 初始化 EXEC_COMMAND 为 bwrap 基础指令
EXEC_COMMAND="bwrap --dev-bind / / bwrap" EXEC_COMMAND="bwrap"
# add_command 函数定义 # add_command 函数定义
function add_command() { function add_command() {
@@ -150,12 +150,11 @@ NON_SANDBOX_BIND_DIRS=(
) )
# 根据 APM_USE_BWRAP 决定是否添加 CAP_SYS_ADMIN # 根据 APM_USE_BWRAP 决定是否添加 CAP_SYS_ADMIN
EXTRA_ARGS=()
if [ "${APM_USE_BWRAP:-0}" != "1" ]; then # EXTRA_ARGS=(
EXTRA_ARGS=( # "--unshare-user-try"
"--cap-add CAP_SYS_ADMIN" # )
)
fi
EXTRA_SCRIPTS=( EXTRA_SCRIPTS=(
# cursor_theme_dir_integration # cursor_theme_dir_integration
+2 -1
View File
@@ -114,7 +114,8 @@ ln -sv ../../usr/share/applications $chrootEnvPath/amber-ce-tools/data-dir/
ln -sv ../../usr/share/icons $chrootEnvPath/amber-ce-tools/data-dir/ ln -sv ../../usr/share/icons $chrootEnvPath/amber-ce-tools/data-dir/
mkdir -p $chrootEnvPath/usr/share/templates mkdir -p $chrootEnvPath/usr/share/templates
ln -sfv ../../usr/share/templates/ $chrootEnvPath/amber-ce-tools/data-dir/ ln -sfv ../../usr/share/templates/ $chrootEnvPath/amber-ce-tools/data-dir/
mkdir -p $chrootEnvPath/usr/share/templates
ln -sfv ../../usr/share/mime/ $chrootEnvPath/amber-ce-tools/data-dir/
chmod 777 -R $chrootEnvPath/usr/share/icons chmod 777 -R $chrootEnvPath/usr/share/icons
rm -vfr $chrootEnvPath/dev/* rm -vfr $chrootEnvPath/dev/*