From 08e04f2b00fb686311e0fa5e57c5249ce394ac82 Mon Sep 17 00:00:00 2001 From: shenmo Date: Thu, 9 Nov 2023 14:43:27 +0800 Subject: [PATCH] 12.3 --- src/DEBIAN/control | 2 +- .../files/bin/bookworm-init | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/DEBIAN/control b/src/DEBIAN/control index 3538a74..7462e05 100755 --- a/src/DEBIAN/control +++ b/src/DEBIAN/control @@ -4,5 +4,5 @@ Section: misc Priority: optional Depends: bubblewrap Maintainer: shenmo -Architecture: amd64 +Architecture: arm64 Description: bwrap wrapper for install and running debs inside a bookworm container diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-init b/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-init index c63af52..747bc7f 100755 --- a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-init +++ b/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-init @@ -19,8 +19,6 @@ echo "Uncompress the env...." tar -xvf $chrootEnvPath.tar.xz -C /opt/apps/$PKGNAME/files/ fi -echo "Update the flamescion container tools" -cp -rv `dirname $chrootEnvPath`/flamescion-container-tools/ $chrootEnvPath non_root_user=$(who | awk '{print $1}' | head -n 1) @@ -183,10 +181,26 @@ ln -sfv /flamescion-container-tools/bin-override/host-spawn-`arch` /flamescion-c EOFFFFFF +#####init + chmod +x $chrootEnvPath/init.sh bookworm-run bash /init.sh bookworm-run rm /init.sh bookworm-run cp /host/etc/locale.gen /etc/locale.gen && locale-gen +echo "Update the flamescion container tools" +cp -rv `dirname $chrootEnvPath`/flamescion-container-tools/ $chrootEnvPath + +if [ ! -e $chrootEnvPath/opt/ace-host-integration/ace-host-integration ];then +echo "Fix: 12.3-new feature: integrate. Installing..." +gitee_api_url="https://gitee.com/api/v5/repos/amber-compatability-environment/ace-host-integration/releases/latest" +resp="$(curl -s $gitee_api_url)" +VERSION_GITEE="$(jq -r '.tag_name' <<<$resp | sed "s/.*V\([^_]*\).*/\1/g")" +echo "$VERSION_GITEE" +bookworm-run wget https://gitee.com/amber-compatability-environment/ace-host-integration/releases/download/0.1/ace-host-integration_${VERSION_GITEE}_all.deb +bookworm-run apt install ./ace-host-integration_${VERSION_GITEE}_all.deb +bookworm-run rm ./ace-host-integration_${VERSION_GITEE}_all.deb +fi + bookworm-run touch /finish.flag bookworm-run apt clean sudo -u $(who | awk '{print $1}' | head -n 1) bwrap --dev-bind $chrootEnvPath/ / \