adjust: now we don't depend dpkg in building

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

.gitignore

@@ -1,2 +1,2 @@
-*.deb
+#*.deb
 src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/ace-env.tar.xz

.workflow/Debian-Build-amd64.yml

@@ -0,0 +1,59 @@
+version: '1.0'
+name: Debian-Build-amd64
+displayName: Debian-Build-amd64
+triggers:
+  trigger: manual
+  push:
+    tags:
+      prefix:
+        - ''
+stages:
+  - name: stage-d1472d18
+    displayName: Build DEB
+    strategy: naturally
+    trigger: auto
+    executor: []
+    steps:
+      - step: execute@docker
+        name: execute_by_docker
+        displayName: Build Debian amd64
+        certificate: ''
+        image: docker.jianmuhub.com/library/debian:bookworm
+        command:
+          - export DEBIAN_FRONTEND=noninteractive
+          - apt update
+          - apt install ca-certificates -y
+          - echo 'deb [trusted=yes] http://mirrors.sdu.edu.cn/debian bookworm main contrib non-free non-free-firmware' > /etc/apt/sources.list
+          - rm -rfv /etc/apt/sources.list.d/*
+          - apt update
+          - apt build-dep . -y
+          - dpkg-buildpackage -b -us -uc
+          - cd ..
+          - ''
+          - mkdir target
+          - for f in $(find . -type f -name "*.deb")
+          - 'do '
+          - mv -v $f target
+          - done
+          - ls -all
+        artifacts:
+          - name: BUILD_ARTIFACT
+            path:
+              - ../target/
+        notify: []
+        strategy:
+          retry: '0'
+  - name: stage-41e41b9f
+    displayName: push
+    strategy: naturally
+    trigger: auto
+    executor: []
+    steps:
+      - step: publish@general_artifacts
+        name: publish_general_artifacts
+        displayName: 上传制品
+        dependArtifact: BUILD_ARTIFACT
+        artifactName: output
+        notify: []
+        strategy:
+          retry: '0'

README.md

@@ -25,7 +25,11 @@ Please use `git clone --recurse-submodules` to obtain the env
 
 ### Manual Install（Debian/Fedora/Arch)
 
-https://pan.huang1111.cn/s/jR1GdUy
+Share Link：https://share.spark-app.store/index.php?share/folder&user=1&sid=wHP86Kp4
+
+Ubuntu 18.04 Need install https://packages.debian.org/buster/bubblewrap
+
+Arch: `yay -S amber-ce-bookworm`
 
 
 ### Amber-CE x86
@@ -34,18 +38,18 @@ Use LAT to run a x86 bookworm container. Can install x86 debs and run x86 apps
 
 https://pan.huang1111.cn/s/P63D6Cm
 
+
+---
+
+
 ## Build Guide
 
 ### Debian
 
-Build the container first then build the package. Container at `src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files`
+```
-Here are the details:
+apt build-dep .
-1. Install dependencies: sudo apt-get install arch-test debootstrap libnss-mymachines systemd-container
+dpkg-buildpackage -us -uc -b 
-2. Enter the terminal at `src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files` and execute `./build-container.sh amd64`.[for amd,other arch please change]
+```
-3. Wait for the container to complete.
-4.Get in to `amber-ce-bookworm` dir,run`fakeroot dpkg-deb -b src .`
-5.Wating for complete.
-
 
 ### Fedora
 

README.zh.md

@@ -1,4 +1,4 @@
-# 书虫兼容模式
+# ACE Debian Bookworm
 
 # [English](README.md)
 
@@ -19,29 +19,24 @@
 
 ### 手动安装（Debian/Fedora/Arch)
 
-https://pan.huang1111.cn/s/jR1GdUy
 
+分享链接：https://share.spark-app.store/index.php?share/folder&user=1&sid=wHP86Kp4
 
-### Amber-CE x86
+Ubuntu 18.04 需要安装 https://packages.debian.org/buster/bubblewrap 
 
-利用 LAT 运行的x86容器，可安装和运行x86的deb  
+Arch：`yay -S amber-ce-bookworm`
 
-https://pan.huang1111.cn/s/P63D6Cm
+---
 
 
 ## 构建指南
 
 ### Debian
 
-先构建容器再打包，容器位置在`src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files`
+```
-
+apt build-dep .
-下面是详细步骤：
+dpkg-buildpackage -us -uc -b 
-
+```
-1. 安装依赖：sudo apt-get install arch-test debootstrap libnss-mymachines systemd-container
-2. 在`src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files`位置进入终端，执行`./build-container.sh amd64`[amd架构，其他架构同理]`
-3. 等待容器打包完成
-4. 进入`amber-ce-bookworm`目录，执行`fakeroot dpkg-deb -b src .`
-5. 等待打包完成
 
 ### Fedora
 

debian/changelog

@@ -1,6 +1,9 @@
-amber-ce-bookworm (12.4.14-2) UNRELEASED; urgency=low
+amber-ce-bookworm (12.4.15-1) UNRELEASED; urgency=low
-
+  * fix: Can't pass args via bwrap
-  * fix: always pop up upgradable 
+  * fix: Auto upgrade service always pop up upgradable notifier
-  * fix: only request main repo
+  * fix: /etc/apt/sources.list only request main repo
+  * fix: sudo function error: Need sudo sudo to really sudo
+  * fix: ACE Host Integration fail
+  * adjust: remove dpkg from building depends
 
  -- shenmo <shenmo@spark-app.store>  Wed, 25 Sep 2024 23:15:49 +0800

debian/control

@@ -2,7 +2,7 @@ Source: amber-ce-bookworm
 Section: misc
 Priority: optional
 Maintainer: shenmo <shenmo@spark-app.store>
-Build-Depends: debhelper-compat (= 13),debootstrap,systemd-container
+Build-Depends: debhelper-compat (= 13),debootstrap,systemd-container,sudo
 Standards-Version: 4.5.1
 Homepage: https://gitee.com/amber-ce/amber-ce-bookworm/
 Rules-Requires-Root: binary-targets

debian/rules

@@ -8,3 +8,6 @@
 override_dh_auto_configure:
 	cd src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files && bash build-container.sh $(shell uname -m)
 
+override_dh_dwz:
+
+override_dh_strip:

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run

@@ -5,7 +5,7 @@ parent_dir=`dirname $curdir`
 pparent_dir=`dirname $parent_dir`
 ppparent_dir=`dirname $pparent_dir`
 PKGNAME=`basename $ppparent_dir`
-export PACKAGE_NAME=$PKGNAME
+export ACE_PACKAGE_NAME=$PKGNAME
 chrootEnvPath=/opt/apps/$PKGNAME/files/ace-env
 
 if [ ! -e $chrootEnvPath/finish.flag ];then

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run-bwrap

@@ -5,7 +5,7 @@ parent_dir=`dirname $curdir`
 pparent_dir=`dirname $parent_dir`
 ppparent_dir=`dirname $pparent_dir`
 PKGNAME=`basename $ppparent_dir`
-export PACKAGE_NAME=$PKGNAME
+export ACE_PACKAGE_NAME=$PKGNAME
 chrootEnvPath=/opt/apps/$PKGNAME/files/ace-env
 
 if [ ! -e $chrootEnvPath/finish.flag ];then

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/build-container.sh

@@ -15,14 +15,14 @@ if [ "$1" = "amd64" ] || [ "$1" = "x86_64" ];then
 ARCH="amd64"
 ARCH_ANOTHERWAY="x64"
 cd "`dirname $0`"
-sudo debootstrap --components=main,contrib,non-free,non-free-firmware --include=libnotify-bin,apt-utils,bash-completion,bc,curl,dialog,diffutils,findutils,gnupg2,less,libnss-myhostname,libvte-common,lsof,ncurses-base,passwd,pinentry-curses,procps,sudo,time,util-linux,wget,libegl1-mesa,libgl1-mesa-glx,libvulkan1,mesa-vulkan-drivers,locales,libglib2.0-bin --arch=${ARCH}  bookworm  ./ace-env https://mirrors.ustc.edu.cn/debian/ 
+sudo debootstrap --components=main,contrib,non-free,non-free-firmware --include=libnotify-bin,apt-utils,bash-completion,bc,curl,dialog,diffutils,findutils,gnupg2,less,libnss-myhostname,libvte-common,lsof,ncurses-base,passwd,pinentry-curses,procps,sudo,time,util-linux,wget,libegl1,libvulkan1,mesa-vulkan-drivers,locales,libglib2.0-bin --arch=${ARCH}  bookworm  ./ace-env https://mirrors.ustc.edu.cn/debian/ 
 
-elif [ "$1" = "arm64" ] || [ "$1" = "arm" ];then
+elif [ "$1" = "arm64" ] || [ "$1" = "arm" ]|| [ "$1" = "aarch64" ];then
 ARCH="arm64"
 ARCH_ANOTHERWAY="arm64"
 
 cd "`dirname $0`"
-sudo debootstrap --components=main,contrib,non-free,non-free-firmware --include=libnotify-bin,apt-utils,bash-completion,bc,curl,dialog,diffutils,findutils,gnupg2,less,libnss-myhostname,libvte-common,lsof,ncurses-base,passwd,pinentry-curses,procps,sudo,time,util-linux,wget,libegl1-mesa,libgl1-mesa-glx,libvulkan1,mesa-vulkan-drivers,locales,libglib2.0-bin --arch=${ARCH} bookworm ./ace-env https://mirrors.ustc.edu.cn/debian/ 
+sudo debootstrap --components=main,contrib,non-free,non-free-firmware --include=libnotify-bin,apt-utils,bash-completion,bc,curl,dialog,diffutils,findutils,gnupg2,less,libnss-myhostname,libvte-common,lsof,ncurses-base,passwd,pinentry-curses,procps,sudo,time,util-linux,wget,libegl1,libvulkan1,mesa-vulkan-drivers,locales,libglib2.0-bin --arch=${ARCH} bookworm ./ace-env https://mirrors.ustc.edu.cn/debian/ 
 elif [ "$1" = "loong" ] || [ "$1" = "loong64" ];then
 ARCH="loong64"
 ARCH_ANOTHERWAY="loong64"
@@ -40,7 +40,7 @@ sudo rm -rf ace-env
 
 pushd flamescion-container-tools/ace-host-integration
 
-dpkg-deb -Z xz -b . ../ace-host-integration.deb
+#dpkg-deb -Z xz -b . ../ace-host-integration.deb
 
 popd
 

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/ace-host-integration/opt/ace-host-integration/ace-host-integration

@@ -63,7 +63,7 @@ local file=$1
     chmod +x $file
 }
 
-if [  "${IS_ACE_ENV}" != "" ];then
+if [  "${IS_ACE_ENV}" != "" ] || [[ -e /opt/ace-host-integration/ace-host-integration ]] && [[ -e /flamescion-container-tools ]];then
 	if [ -e /opt/apps/ ];then
 	for app_dir in $(ls /opt/apps/); do
 		for file in /opt/apps/$app_dir/entries/applications/*.desktop;do

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/bwrap

@@ -1,2 +1,2 @@
 #!/bin/bash
-host-spawn /opt/apps/amber-ce-bookworm/files/bin/bookworm-run-bwrap $@
+host-spawn /opt/apps/amber-ce-bookworm/files/bin/bookworm-run-bwrap "$@"

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/sudo

@@ -2,5 +2,5 @@
 if [ "$UID" = "0" ];then
 /usr/bin/sudo $@
 else
-host-spawn sudo bookworm-run $@
+host-spawn sudo bookworm-run sudo $@
 fi

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/container-init/init.sh

@@ -127,6 +127,7 @@ apt install --reinstall /flamescion-container-tools/ace-host-integration.deb
 cd /flamescion-container-tools/data-dir/
 ln -sfv ../../usr/share/applications/ .
 ln -sfv ../../usr/share/icons/ .
-ln -svf ../../usr/share/mime .
+#ln -svf ../../usr/share/mime .
+rm -vf ./mime
 update-desktop-database /usr/share/applications || true
 update-mime-database /usr/share/mime || true