diff --git a/apm-dummy/usr/bin/amber-pm-dstore-patch b/apm-dummy/usr/bin/amber-pm-dstore-patch index b13eee6..f7ebd1a 100755 --- a/apm-dummy/usr/bin/amber-pm-dstore-patch +++ b/apm-dummy/usr/bin/amber-pm-dstore-patch @@ -116,11 +116,10 @@ function exec_uos_package_update(){ ######################################################################################### echo "----------------Running APM Dstore Patch----------------" -if [ ! -e /usr/bin/deepin-app-store-tool ];then -# execute linkApp function for each app and print output + exec_uos_package_link -fi + #exec_v23_icon_link exec_link_clean wait diff --git a/src/DEBIAN/control b/src/DEBIAN/control index 351d1dd..0faa6e2 100755 --- a/src/DEBIAN/control +++ b/src/DEBIAN/control @@ -1,9 +1,9 @@ Package: apm Source: amber-ce -Version: 1.0.5 +Version: 1.0.6 Architecture: amd64 Maintainer: shenmo -Installed-Size: 48680 +Installed-Size: 48540 Depends: bubblewrap, flatpak, policykit-1 | pkexec | polkit-1 | polkit, systemd, procps,coreutils,fuse-overlayfs Section: misc Conflicts: ace-host-integration diff --git a/src/usr/bin/amber-pm-dstore-patch b/src/usr/bin/amber-pm-dstore-patch index b13eee6..fe1f532 100755 --- a/src/usr/bin/amber-pm-dstore-patch +++ b/src/usr/bin/amber-pm-dstore-patch @@ -116,11 +116,11 @@ function exec_uos_package_update(){ ######################################################################################### echo "----------------Running APM Dstore Patch----------------" -if [ ! -e /usr/bin/deepin-app-store-tool ];then + # execute linkApp function for each app and print output exec_uos_package_link -fi + #exec_v23_icon_link exec_link_clean wait diff --git a/src/usr/bin/apm b/src/usr/bin/apm index 3cfde11..7d972f8 100755 --- a/src/usr/bin/apm +++ b/src/usr/bin/apm @@ -21,6 +21,7 @@ Commands: install 安装软件包 remove 卸载软件包 update 更新软件包信息 + clean 清除缓存软件包 autoremove 自动移除不需要的包 full-upgrade 完全升级软件包 run 运行指定软件包的可执行文件 @@ -111,7 +112,7 @@ case "$1" in amber-pm-debug aptss "$command" "$@" apm-nvidia-toggle ;; - remove|autoremove|search|policy|list|update|purge|autopurge) + remove|autoremove|search|policy|list|update|purge|autopurge|clean) # 特殊APT命令:移除第一个参数后传递其余参数 command=$1 shift diff --git a/src/usr/lib/systemd/system/apm-daily-update.service b/src/usr/lib/systemd/system/apm-daily-update.service index 8ab86ff..323beb6 100755 --- a/src/usr/lib/systemd/system/apm-daily-update.service +++ b/src/usr/lib/systemd/system/apm-daily-update.service @@ -1,12 +1,12 @@ [Unit] -Description=APM GXDE Fixer +Description=APM Daily Update After=apt-daily.service network.target network-online.target systemd-networkd.service NetworkManager.service connman.service [Service] Type=simple RemainAfterExit=yes -ExecStart=/var/lib/apm/apm/files/bin/ace-gxde-fixer +ExecStart=apm clean && apm update Restart=on-failure RestartSec=10 diff --git a/src/usr/lib/systemd/system/gxde-apm-fixer.service b/src/usr/lib/systemd/system/gxde-apm-fixer.service index d783cf6..d018962 100755 --- a/src/usr/lib/systemd/system/gxde-apm-fixer.service +++ b/src/usr/lib/systemd/system/gxde-apm-fixer.service @@ -6,7 +6,7 @@ After=apt-daily.service network.target network-online.target systemd-networkd.se [Service] Type=simple RemainAfterExit=yes -ExecStart=apm update +ExecStart=/var/lib/apm/apm/files/bin/ace-gxde-fixer Restart=on-failure RestartSec=10