adjust: 默认目录改成 amber-ce-bookworm

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
+src/opt/apps/amber-ce-bookworm/files/ace-env.tar.xz

.workflow/Debian-Build-amd64.yml

@@ -29,17 +29,17 @@ stages:
           - apt build-dep . -y
           - dpkg-buildpackage -b -us -uc
           - cd ..
-          - ls -all
+          - ''
           - mkdir target
           - for f in $(find . -type f -name "*.deb")
           - 'do '
-          - mv $f target
+          - mv -v $f target
           - done
-          - ''
+          - ls -all
         artifacts:
           - name: BUILD_ARTIFACT
             path:
-              - ./target
+              - ../target/
         notify: []
         strategy:
           retry: '0'

README.md

@@ -25,10 +25,12 @@ 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
 
@@ -44,14 +46,10 @@ https://pan.huang1111.cn/s/P63D6Cm
 
 ### 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

@@ -19,17 +19,12 @@
 
 ### 手动安装（Debian/Fedora/Arch)
 
-https://pan.huang1111.cn/s/jR1GdUy
+
+分享链接：https://share.spark-app.store/index.php?share/folder&user=1&sid=wHP86Kp4
 
 Ubuntu 18.04 需要安装 https://packages.debian.org/buster/bubblewrap 
 
-
+Arch：`yay -S amber-ce-bookworm`
-### Amber-CE x86
-
-利用 LAT 运行的x86容器，可安装和运行x86的deb  
-
-https://pan.huang1111.cn/s/P63D6Cm
-
 
 ---
 
@@ -38,15 +33,10 @@ 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,8 +1,10 @@
-amber-ce-bookworm (12.4.14-4) UNRELEASED; urgency=low
+amber-ce-bookworm (12.5) UNRELEASED; urgency=low
-
+  * fix: Can't pass args via bwrap
   * fix: Auto upgrade service always pop up upgradable notifier
   * 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
+  * 把默认目录改为 amber-ce-bookworm
 
  -- shenmo <shenmo@spark-app.store>  Wed, 25 Sep 2024 23:15:49 +0800

debian/cn.flamescion.bookworm-compatibility-mode.postinst

@@ -2,17 +2,21 @@
 export PACKAGE_NAME="$DPKG_MAINTSCRIPT_PACKAGE"
 
 if [ "${PACKAGE_NAME}" = "cn.flamescion.bookworm-compatibility-mode" ];then
-if [ -d /opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bookworm-env ];then
+if [ -d /opt/apps/cn.flamescion.bookworm-compatibility-mode/ ] || [[ -f "/opt/apps/amber-ce-bookworm" ]];then
 
-mv /opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bookworm-env /opt/apps/cn.flamescion.bookworm-compatibility-mode/files/ace-env
+unlink /opt/apps/amber-ce-bookworm 
-ln -sfv /opt/apps/cn.flamescion.bookworm-compatibility-mode/files/ace-env /opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bookworm-env
+mv -v /opt/apps/cn.flamescion.bookworm-compatibility-mode/ /opt/apps/amber-ce-bookworm/
+
+ln -sv ./amber-ce-bookworm /opt/apps/cn.flamescion.bookworm-compatibility-mode
 
 
 fi
 fi
 
+
 /opt/apps/$PACKAGE_NAME/files/bin/ace-init
 
+
 if [ "${PACKAGE_NAME}" = "cn.flamescion.bookworm-compatibility-mode" ];then
 systemctl daemon-reload
 systemctl enable ace-bookworm-auto-upgrade

debian/cn.flamescion.bookworm-compatibility-mode.postrm

@@ -2,6 +2,7 @@
 PACKAGE_NAME="$DPKG_MAINTSCRIPT_PACKAGE"
 
 if [ "${PACKAGE_NAME}" = "cn.flamescion.bookworm-compatibility-mode" ];then
+PACKAGE_NAME=amber-ce-bookworm # 为了后面正确清理
 systemctl stop ace-bookworm-auto-upgrade
 systemctl disable ace-bookworm-auto-upgrade
 fi

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

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

src/opt/apps/amber-ce-bookworm

@@ -1 +0,0 @@
-./cn.flamescion.bookworm-compatibility-mode/

src/opt/apps/amber-ce-bookworm/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" ]|| [ "$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/amber-ce-bookworm/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/amber-ce-bookworm/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

src/opt/apps/cn.flamescion.bookworm-compatibility-mode

@@ -0,0 +1 @@
+./amber-ce-bookworm/