diff --git a/debian/changelog b/debian/changelog index b922cf0..b7aa302 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -amber-ce-bookworm (12.6.0) UNRELEASED; urgency=low +amber-ce-bookworm (12.6.1) 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 diff --git a/src/opt/apps/amber-ce-bookworm/files/bin/ace-init b/src/opt/apps/amber-ce-bookworm/files/bin/ace-init index af36069..a9704b3 100755 --- a/src/opt/apps/amber-ce-bookworm/files/bin/ace-init +++ b/src/opt/apps/amber-ce-bookworm/files/bin/ace-init @@ -114,3 +114,4 @@ sudo -u $(who | awk '{print $1}' | head -n 1) bwrap --dev-bind $chrootEnvPath/ / bookworm-run update-locale LANG=$LANG chown -R root $chrootEnvPath chmod 777 -R $chrootEnvPath/usr/share/icons +bookworm-configure-nvidia || true \ No newline at end of file diff --git a/nvidia-configure.sh b/src/opt/apps/amber-ce-bookworm/files/bin/bookworm-configure-nvidia similarity index 76% rename from nvidia-configure.sh rename to src/opt/apps/amber-ce-bookworm/files/bin/bookworm-configure-nvidia index 0aadd5a..5ee6f80 100644 --- a/nvidia-configure.sh +++ b/src/opt/apps/amber-ce-bookworm/files/bin/bookworm-configure-nvidia @@ -4,19 +4,24 @@ log.error() { echo -e "[\e[31mERROR\e[0m]: \e[1m$*\e[0m"; } log.info() { echo -e "[\e[96mINFO\e[0m]: \e[1m$*\e[0m"; } log.debug() { echo -e "[\e[32mDEBUG\e[0m]: \e[1m$*\e[0m"; } +if [ "$UID" != "0" ];then +log.error "需要以root权限运行 Need to be run as root." +exit 1 +fi + # 1\. 获取宿主机 NVIDIA 驱动版本 nvidia_version=$(cat /sys/module/nvidia/version 2>/dev/null) if [ -z "$nvidia_version" ]; then - log.error "无法获取 NVIDIA 驱动版本" + log.error "无法获取 NVIDIA 驱动版本 Can not determine NVIDIA Driver version" exit 1 fi # 2\. 目标目录准备 ACE_DIR="/opt/apps/amber-ce-bookworm/files/ace-env" if [[ ! -e "${ACE_DIR}" ]];then -log.error "未检测到 ACE Bookworm 安装,请安装后再试" +log.error "未检测到 ACE Bookworm 安装,请安装后再试 ACE Bookworm is not detected. Please try again after installation" spark-store spk://store/tools/cn.flamescion.bookworm-compatibility-mode & -log.info "请按回车关闭..." +log.info "请按回车关闭... Press Enter to close..." read exit 1 fi @@ -54,7 +59,7 @@ done # 6\. 标记版本 if [ $copied -eq 1 ]; then echo "$nvidia_version" > "$ACE_DIR/current_version" - log.info "NVIDIA 驱动库已成功链接" + log.info "NVIDIA 驱动库已成功链接 Nvidia Driver Libs are successfully linked. " else - log.error "未找到有效 NVIDIA 库文件" + log.error "未找到有效 NVIDIA 库文件 No valid NVIDIA Driver Libs found." fi \ No newline at end of file diff --git a/src/usr/bin/bookworm-configure-nvidia b/src/usr/bin/bookworm-configure-nvidia new file mode 120000 index 0000000..4a67b46 --- /dev/null +++ b/src/usr/bin/bookworm-configure-nvidia @@ -0,0 +1 @@ +../../opt/apps/amber-ce-bookworm/files/bin/bookworm-configure-nvidia \ No newline at end of file