准备1.1.3更新

Signed-off-by: shenmo <jifengshenmo@outlook.com>

Packaging-demo/README.md

@@ -76,6 +76,14 @@ PACKAGE_NAME="$DPKG_MAINTSCRIPT_PACKAGE"
 if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
     echo "清理卸载残留"
     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
     echo "非卸载，跳过清理"
 fi

README.md

@@ -16,6 +16,12 @@ APM 目前提供 Debian 12/13 与 deepin 25 基础环境，支持将适配以上
 > 
 > OverlayFS 原理解析：[https://www.cnblogs.com/arnoldlu/p/13055501.html](https://www.cnblogs.com/arnoldlu/p/13055501.html)。
 
+## 体验
+
+前往右侧的 [发行版](https://gitee.com/amber-ce/amber-pm/releases/) 即可下载体验
+
+目前支持 Debian 10+ , Arch Linux , fedora 42/43, openSUSE(测试) ,deepin/UOS 20+ , Ubuntu 20+ , 银河麒麟v10sp1，openkylin
+
 ## 使用方法
 ```
 APM - Amber Package Manager 1.0.10
@@ -26,22 +32,29 @@ Usage:
 Commands:
   install           安装软件包
   remove            卸载软件包
+  run <package>     运行指定软件包的可执行文件
+  sandbox-run <package> 运行指定软件包的可执行文件（主目录沙箱化）
+
   update            更新软件包信息
+  hold              锁定软件包版本
+  unhold            解锁软件包版本
+  full-upgrade      升级全部软件包
   list              查看可用软件包信息
-  show              查看软件包信息
   search            搜索软件包
+
   download          下载包
+  show              展示包信息
   clean             清除缓存软件包
   autoremove        自动移除不需要的包
-  full-upgrade      完全升级软件包
-  run <package>     运行指定软件包的可执行文件
   ssaudit <path>    使用 ssaudit 进行本地软件安装，详情见 spark-store
   debug             显示调试系统信息并进入调试环境
+
   amber             彩蛋功能
   xmp360            彩蛋功能
   bronya            彩蛋功能
 
   -h, --help        显示此帮助信息
+  -v, --version     展示APM版本号
 
 ```
 

src/DEBIAN/control

@@ -1,10 +1,11 @@
 Package: apm
 Source: amber-ce
-Version: 1.1.1
+Version: 1.1.3
 Architecture: amd64
 Maintainer: shenmo <shenmo@spark-app.store>
-Installed-Size: 48724
+Installed-Size: 48992
-Depends: bubblewrap, flatpak,  policykit-1 | pkexec | polkit-1 | polkit, systemd, procps,coreutils,fuse-overlayfs,xz-utils,libnotify-bin,curl
+Depends: bubblewrap, flatpak,  policykit-1 | pkexec | polkit-1 | polkit, systemd, procps,coreutils,fuse-overlayfs,xz-utils,libnotify-bin,curl,xdg-user-dirs,bash
+Recommends: dpkg, fakeroot, busybox
 Section: misc
 Conflicts: ace-host-integration
 Priority: optional

src/DEBIAN/postrm

@@ -10,6 +10,16 @@ if [ "$1" = "remove" ] || [ "$1" = "purge" ];then
 echo "清理卸载残留"
 
 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
 echo "非卸载，跳过清理"
 fi

src/usr/bin/amber-pm-convert

@@ -231,6 +231,7 @@ dpkg -e "$DEB_PATH" "$MODIFIED_DEB_DIR/DEBIAN"
 DESKTOP_MODIFIED=false
 find "$EXTRACT_DIR" -name "*.desktop" | while read -r desktop_file; do
     log.info "处理桌面文件: $desktop_file"
+    busybox dos2unix $desktop_file
     DESKTOP_MODIFIED=true
 
     # 在Exec和TryExec行前追加 "apm run $NEW_PKGNAME"
@@ -239,9 +240,10 @@ find "$EXTRACT_DIR" -name "*.desktop" | while read -r desktop_file; do
         sed -i 's/^Exec=\(.*\)$/Exec=apm run '"$NEW_PKGNAME"' \1/' "$desktop_file"
     fi
     
-    # 处理TryExec行
+# 处理TryExec行 - 直接删除
 if grep -q '^TryExec=' "$desktop_file"; then
-        sed -i 's/^TryExec=\(.*\)$/TryExec=apm run '"$NEW_PKGNAME"' \1/' "$desktop_file"
+    sed -i '/^TryExec=/d' "$desktop_file"
+    log.info "已删除TryExec行"
 fi
 
     # 处理Icon路径
@@ -319,20 +321,28 @@ for BASENAME in "${BASENAMES[@]}"; do
     log.info "  写入: $BASENAME"
 done
 
-# 创建postinst脚本
+# 创建postrm脚本
-cat > "$PKG_BUILD_DIR/DEBIAN/postinst" << 'EOF'
+cat > "$PKG_BUILD_DIR/DEBIAN/postrm" << 'EOF'
 #!/bin/bash
 PACKAGE_NAME="$DPKG_MAINTSCRIPT_PACKAGE"
 
 if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
     echo "清理卸载残留"
     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
     echo "非卸载，跳过清理"
 fi
 EOF
 
-chmod +x "$PKG_BUILD_DIR/DEBIAN/postinst"
+chmod +x "$PKG_BUILD_DIR/DEBIAN/postrm"
 
 # 8. 复制文件到新的APM包
 log.info "复制文件到新的APM包..."
@@ -391,7 +401,7 @@ EOF
 OUTPUT_DEB="${NEW_PKGNAME}_${NEW_VERSION}_${ORIG_ARCH}.deb"
 
 # 打包
-fakeroot  dpkg-deb --build "$PKG_BUILD_DIR" "$OUTPUT_DEB"
+fakeroot  dpkg-deb -Z xz --build "$PKG_BUILD_DIR" "$OUTPUT_DEB"
 
 log.info  "转换完成！"
 log.info "生成的APM包: $OUTPUT_DEB"

src/usr/bin/amber-pm-gxde-desktop-fix

@@ -4,6 +4,39 @@ if [[ ! -e "/usr/share/gxde-api" ]] && ! grep -q "Kylin" /etc/os-release; then
     exit 0 # No needed
 fi
 
+# 确定目标目录
+if grep -q "Kylin" /etc/os-release; then
+    TARGET_BASE="/usr/share"
+    echo "检测到麒麟系统，使用目标目录: $TARGET_BASE"
+else
+    TARGET_BASE="/usr/local/share"
+    echo "检测到GXDE环境，使用目标目录: $TARGET_BASE"
+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() {
     local source_dir="$1"
@@ -18,13 +51,17 @@ process_directory() {
     fi
 }
 
+# 使用动态确定的目标目录
+ensure_dir "$TARGET_BASE/applications/"
+ensure_dir "$TARGET_BASE/icons/"
+
 # 处理 applications 目录
 process_directory "/var/lib/apm/apm/files/ace-env/amber-ce-tools/data-dir/applications/" \
-                  "/usr/local/share/applications/" "Applications"
+                  "$TARGET_BASE/applications/" "Applications"
 
 # 处理 icons 目录
 process_directory "/var/lib/apm/apm/files/ace-env/amber-ce-tools/data-dir/icons/" \
-                  "/usr/local/share/icons/" "Icons"
+                  "$TARGET_BASE/icons/" "Icons"
 
 # 等待所有后台任务完成
 wait

src/usr/bin/apm

@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION=1.1.1
+VERSION=1.1.3
 # 获取脚本名称用于帮助信息
 SCRIPT_NAME=$(basename "$0")
 PATH_PREFIX=/var/lib/apm/apm/files/ace-env/
@@ -22,6 +22,8 @@ Commands:
   install           安装软件包
   remove            卸载软件包
   run <package>     运行指定软件包的可执行文件
+  sandbox-run <package> 运行指定软件包的可执行文件（主目录沙箱化）
+  bwrap-run <package> 运行指定软件包的可执行文件（使用特殊的挂载参数以支持bwrap）
 
   update            更新软件包信息
   hold              锁定软件包版本
@@ -54,6 +56,9 @@ apm_exec(){
     local current_dir="${PATH_PREFIX}/var/lib/apm/${coredir}"  # 当前目录开始
     local next_info_file=""
     
+    # 使用统一的 ace-run 脚本
+    APM_RUN_EXEC=/var/lib/apm/apm/files/ace-run
+    
     while : ; do
         # 构建info文件的路径
         next_info_file="${current_dir}/info"
@@ -105,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}"
     
     # 执行命令
-    chrootEnvPath="/tmp/apm/${coredir}" /var/lib/apm/apm/files/ace-run "$@"
+    chrootEnvPath="/tmp/apm/${coredir}" ${APM_RUN_EXEC} "$@"
     
     # 卸载
     umount "/tmp/apm/${coredir}"
@@ -236,7 +241,7 @@ case "$1" in
     apm-nvidia-toggle
     amber-pm-gxde-desktop-fix
     ;;
-    download|search|policy|list|update|clean|show)
+    download|search|policy|list|update|clean|show|depends|rdepends|changelog|moo)
     command=$1
     shift
     amber-pm-debug aptss "$command" "$@"
@@ -301,7 +306,7 @@ case "$1" in
         fi
         
         coredir=$pkg
-
+        export APM_PKG_NAME=$pkg
 
         # 检测是否有额外命令参数
         if [ $# -gt 0 ]; then
@@ -314,6 +319,18 @@ case "$1" in
             exit 1
         fi
         ;;
+   sandbox-run)
+        # 运行包命令：第二个参数必须是包名
+        export APM_USE_SANDBOX=1
+        shift
+        $0 run "$@"
+        ;;
+   bwrap-run)
+        # 运行包命令：使用特殊的挂载参数以支持bwrap
+        export APM_USE_BWRAP=1
+        shift
+        $0 run "$@"
+        ;;
     debug)
         shift
         debug_info $@

src/usr/share/bash-completion/completions/apm

@@ -44,11 +44,15 @@ _apm()
         "update"
         "upgrade" "full-upgrade" "dist-upgrade"
         "run"
+        "sandbox-run"
+        "bwrap-run"
         "help"
         "source" "build-dep"
         "clean" "autoclean"
         "download" "changelog"
         "amber"
+        "xmp360"
+        "bronya"
         "debug"
         "depends" "rdepends"
         "policy")
@@ -236,7 +240,7 @@ fi
                     command grep "^Source: $cur" | sort -u | cut -f2 -d" " ) )
                 return 0
                 ;;
-            run)
+            run|sandbox-run|bwrap-run)
                 COMPREPLY=( $( compgen -W "$(apm_run_compgen)" "$cur" ) )
                 return 0
                 ;;

src/var/lib/apm/apm/files/ace-run

@@ -1,17 +1,49 @@
 #!/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\]]\\\$ \"") $@
 }
 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}/
 
+# 根据沙盒模式决定是否创建其他目录
+if [ "${APM_USE_SANDBOX:-0}" = "1" ]; then
+    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))
+fi
 
 #### This part is for args pharm
 if [ "$1" = "" ];then
@@ -67,13 +99,6 @@ for directory in "/usr/share/icons"/*; do
         fi
     fi
 done
-
-
-
-
-
-
-
 }
 ##########合成bwrap 3. 环境变量和目录绑定配置段
 # 添加环境变量和其他初始设置
@@ -86,7 +111,8 @@ ENV_VARS=(
     "XDG_DATA_DIRS /amber-ce-tools/additional-data-dir-in-container:\$XDG_DATA_DIRS"
 )
 
-BIND_DIRS=(
+# 基础绑定目录（始终绑定）
+BASE_BIND_DIRS=(
     "--dev-bind $chrootEnvPath/ /"
     "--dev-bind-try /media /media"
     "--dev-bind-try /mnt /mnt"
@@ -103,10 +129,32 @@ BIND_DIRS=(
     "--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}/.deepinwine $HOME/.deepinwine"
 )
+
+# 沙盒模式下的额外绑定目录
+SANDBOX_BIND_DIRS=(
+    "--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)"
+)
+
+# 非沙盒模式下的绑定目录（只绑定.deepinwine）
+NON_SANDBOX_BIND_DIRS=(
+    "--dev-bind-try $HOME/.deepinwine $HOME/.deepinwine"
+)
+
+# 根据 APM_USE_BWRAP 决定是否添加 CAP_SYS_ADMIN
+EXTRA_ARGS=()
+if [ "${APM_USE_BWRAP:-0}" != "1" ]; then
     EXTRA_ARGS=(
         "--cap-add CAP_SYS_ADMIN"
     )
+fi
 
 EXTRA_SCRIPTS=(
 #    cursor_theme_dir_integration
@@ -118,10 +166,23 @@ for var in "${ENV_VARS[@]}"; do
     add_env_var $var
 done
 
-for var in "${BIND_DIRS[@]}"; do
+# 添加基础绑定目录
+for var in "${BASE_BIND_DIRS[@]}"; do
     add_command "$var"
 done
 
+# 根据沙盒模式添加不同的绑定目录
+if [ "${APM_USE_SANDBOX:-0}" = "1" ]; then
+    for var in "${SANDBOX_BIND_DIRS[@]}"; do
+        add_command "$var"
+    done
+else
+    for var in "${NON_SANDBOX_BIND_DIRS[@]}"; do
+        add_command "$var"
+    done
+fi
+
+# 添加额外参数
 for var in "${EXTRA_ARGS[@]}"; do
     add_command "$var"
 done
@@ -138,5 +199,3 @@ add_command "bash -c \"${container_command}\""
 
 # 注意: 实际执行时，请确保所有变量（如 $uid, $chrootEnvPath 等）都已正确定义
 eval ${EXEC_COMMAND}
-
-

src/var/lib/apm/apm/files/ace-run-pkg

@@ -140,4 +140,3 @@ add_command "bash -c \"${container_command}\""
 # 注意: 实际执行时，请确保所有变量（如 $uid, $chrootEnvPath 等）都已正确定义
 eval ${EXEC_COMMAND}
 
-