From 95ab791b2004fec5ef5a698b6233cd9e2f1f2cb2 Mon Sep 17 00:00:00 2001 From: xunmi-pc <寻觅> Date: Fri, 23 Feb 2024 16:03:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=96=B0=E6=97=A7=E4=B8=96=E7=95=8C=E5=88=A4=E6=96=AD=E6=A0=87?= =?UTF-8?q?=E5=87=86,=20=E9=87=87=E7=94=A8=E6=96=B0=E6=97=A7=E4=B8=96?= =?UTF-8?q?=E7=95=8C=E5=85=BC=E5=AE=B9=E5=B1=82=E7=9A=84=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .测试.zsh.swp | Bin 24576 -> 0 bytes 安装.zsh | 12 +++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 .测试.zsh.swp diff --git a/.测试.zsh.swp b/.测试.zsh.swp deleted file mode 100644 index b8c37af123012a5d6023a548b7af41ed140c3505..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 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 diff --git a/安装.zsh b/安装.zsh index 592f666..b3e637f 100755 --- a/安装.zsh +++ b/安装.zsh @@ -50,8 +50,14 @@ readonly 系统_发行版_名称=$(echo "${NAME}") *loong*) 主机_架构="龙" # 6之前除了5.19以外的所有内核都是旧世界 - if [[ ${系统_版本} =~ ^[3,4,5].+ && !${系统_版本} =~ ^5.19.0-.+ ]]; then - 世界_类型="旧世界" + #if [[ ${系统_版本} =~ ^[3,4,5].+ && !${系统_版本} =~ ^5.19.0-.+ ]]; then + # 世界_类型="旧世界" + #fi + # 使用更高级的方法判断新旧世界 + # 龙架构二进制 第四行是43开头是新世界, 03开头是旧世界 + 世界_类型_标志位=$(hexdump -s 48 -C /usr/bin/sh | head -n 1 | awk '{print $2}') + if [[ ${世界_类型_标志位} == "43" ]];then + 世界_类型="新世界" fi ;; *) @@ -99,7 +105,7 @@ readonly 系统_发行版_名称=$(echo "${NAME}") # 将本机信息更新到指定文件 mkdir -vp ${目录_配置} rm -v ${目录_配置}/信息.zsh - echo "系统_发行版标识=${系统_发行版_标识}" >> ${目录_配置}/信息.zsh + echo "系统_发行版标识=${系统_发行版_标识符}" >> ${目录_配置}/信息.zsh echo "系统_世界类型=${世界_类型}" >> ${目录_配置}/信息.zsh echo "系统_主机架构=${主机_架构}" >> ${目录_配置}/信息.zsh 输出 0 "主机信息检测完毕"