Update install.sh

bin/install.sh

@@ -54,13 +54,6 @@ if ! sudo dpkg-reconfigure --frontend=noninteractive locales; then
   exit 1
 fi
 
-# 如果需要调试输出
-debug() {
-  if [ "$DEBUG" = true ]; then
-    echo "$@"
-  fi
-}
-
 # Debian版本相关命令
 DEBIAN_VERSION=$(cat /etc/debian_version)
 
@@ -79,29 +72,73 @@ DEBIAN_SECURITY_MIRROR="http://security.debian.org/"
 PI_SUGAR_POWER_MANAGER_URL="https://cdn.pisugar.com/release/pisugar-power-manager.sh"
 INK_SCREEN_CLOCK_REPO_URL="https://github.com/kxgx/2.13-Ink-screen-clock.git"
 PIPY_MIRROR="https://pypi.org/simple"
+# 修改 Raspberry Pi 特定源链接
+RASPBERRY_PI_SOURCE_DEBIAN11="https://archive.raspberrypi.org/debian/"
+RASPBERRY_PI_SOURCE_DEBIAN12="https://archive.raspberrypi.com/debian/"
 
 # 如果使用中国镜像源，则更新链接变量
 if [ "$USE_CN_MIRROR" = true ]; then
-  DEBIAN_MIRROR="https://mirrors.cernet.edu.cn/debian/"
+  DEBIAN_MIRROR="https://mirrors.tuna.tsinghua.edu.cn/debian/"
-  DEBIAN_SECURITY_MIRROR="https://mirrors.cernet.edu.cn/debian-security"
+  DEBIAN_SECURITY_MIRROR="https://mirrors.tuna.tsinghua.edu.cn/debian-security"
   INK_SCREEN_CLOCK_REPO_URL="https://gitee.com/xingguangk/2.13-Ink-screen-clock.git"
   PIPY_MIRROR="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
+  # 使用中国镜像源时，Raspberry Pi 特定源链接保持不变
+  RASPBERRY_PI_SOURCE_DEBIAN11="https://mirrors.tuna.tsinghua.edu.cn/raspberrypi/"
+  RASPBERRY_PI_SOURCE_DEBIAN12="https://mirrors.tuna.tsinghua.edu.cn/raspberrypi/"
 fi
 
 # 更新源列表函数
 update_sources_list() {
   local version=$1
-  debug "正在更新版本 $version 的源列表"
+  local debian_mirror_in_use=$(grep -oP 'deb\s+\K.+' /etc/apt/sources.list | head -1)
-  sudo cp /etc/apt/sources.list /etc/apt/sources.list.bak
+  local raspberry_pi_source_in_use=$(grep -oP 'deb\s+\K.+' /etc/apt/sources.list.d/raspi.list | head -1)
-  {
+
-    echo "deb $DEBIAN_MIRROR $version main contrib non-free"
+  # 检查并替换 Debian 源
-    echo "# deb-src $DEBIAN_MIRROR $version main contrib non-free"
+  if [ "$debian_mirror_in_use" != "$DEBIAN_MIRROR" ]; then
-  } | sudo tee /etc/apt/sources.list > /dev/null
+    sudo cp /etc/apt/sources.list /etc/apt/sources.list.bak
+    {
+    if [ "$version" = "bookworm" ]; then
+      echo "deb $DEBIAN_MIRROR $version main contrib non-free non-free-firmware"
+      echo "# deb-src $DEBIAN_MIRROR $version main contrib non-free non-free-firmware"
+      echo "deb $DEBIAN_MIRROR $version-updates main contrib non-free non-free-firmware"
+      echo "# deb-src $DEBIAN_MIRROR $version-updates main contrib non-free non-free-firmware"
+      echo "deb $DEBIAN_SECURITY_MIRROR $version-security main contrib non-free non-free-firmware"
+      echo "# deb-src $DEBIAN_SECURITY_MIRROR $version-security main contrib non-free non-free-firmware"
+    else
+      echo "deb $DEBIAN_MIRROR $version main contrib non-free"
+      echo "# deb-src $DEBIAN_MIRROR $version main contrib non-free"
+      echo "deb $DEBIAN_MIRROR $version-updates main contrib non-free"
+      echo "# deb-src $DEBIAN_MIRROR $version-updates main contrib non-free"
+      echo "deb $DEBIAN_SECURITY_MIRROR $version-security main contrib non-free"
+      echo "# deb-src $DEBIAN_SECURITY_MIRROR $version-security main contrib non-free"
+    fi
+    } | sudo tee /etc/apt/sources.list > /dev/null
+  else
+    echo "Debian 源链接已更新，跳过替换" >&2
+  fi
+
+  # 检查并替换 Raspberry Pi 特定源
+  if [ "$version" == "bullseye" ]; then
+    RASPBERRY_PI_SOURCE=$RASPBERRY_PI_SOURCE_DEBIAN11
+  elif [ "$version" == "bookworm" ]; then
+    RASPBERRY_PI_SOURCE=$RASPBERRY_PI_SOURCE_DEBIAN12
+  else
+    echo "未知的Debian版本: $version" >&2
+    exit 1
+  fi
+
+  if [ "$raspberry_pi_source_in_use" != "$RASPBERRY_PI_SOURCE$version" ]; then
+    if [ -f "/etc/apt/sources.list.d/raspi.list" ]; then
+      sudo cp /etc/apt/sources.list.d/raspi.list /etc/apt/sources.list.d/raspi.list.bak
+    fi
+    echo "deb $RASPBERRY_PI_SOURCE $version main" | sudo tee /etc/apt/sources.list.d/raspi.list > /dev/null
+  else
+    echo "Raspberry Pi 源链接已更新，跳过替换" >&2
+  fi
 }
 
 # 安装包函数
 install_packages() {
-  debug "正在安装软件包..."
   if ! sudo apt-get update; then
     echo "更新源列表失败" >&2
     exit 1
@@ -118,54 +155,61 @@ install_packages() {
 
 # 安装pip包函数
 install_pip_packages() {
-  debug "正在安装pip软件包..."
+  if ! sudo pip3 install -i "$PIPY_MIRROR" spidev borax pillow requests; then
-  if ! sudo pip3 install -i $PIPY_MIRROR spidev borax pillow requests; then
+    echo "pip软件包安装包失败" >&2
-    echo "pip软件包安装失败" >&2
-    exit 1
   fi
 }
 
 # 复制服务文件并设置为开机启动
 setup_service() {
-  debug "正在设置墨水屏时钟服务..."
+  local service_path="raspi_e-Paper.service"
-  if [ ! -d "$HOME/2.13-Ink-screen-clock" ]; then
+  local service1_path="e-Paper_clean.service"
-  cd ~
+  local service_file_path="$HOME/2.13-Ink-screen-clock/bin/$service_path"
-  if ! git clone $INK_SCREEN_CLOCK_REPO_URL; then
+  local service1_file_path="$HOME/2.13-Ink-screen-clock/bin/$service1_path"
-    echo "克隆墨水屏时钟仓库失败" >&2
-    exit 1
-  fi
-  # 设置start.sh和clean.sh脚本的执行权限
-  chmod +x "$HOME/2.13-Ink-screen-clock/bin/start.sh"
-  chmod +x "$HOME/2.13-Ink-screen-clock/bin/clean.sh"
-fi
 
-SERVICE_PATH="raspi_e-Paper.service"
+  # 检查墨水屏时钟仓库是否存在
-SERVICE1_PATH="e-Paper_clean.service"
+  if [ ! -d "$HOME/2.13-Ink-screen-clock" ]; then
-SERVICE_FILE_PATH="$HOME/2.13-Ink-screen-clock/bin/$SERVICE_PATH"
+    cd ~
-SERVICE1_FILE_PATH="$HOME/2.13-Ink-screen-clock/bin/$SERVICE1_PATH"
+    if ! git clone $INK_SCREEN_CLOCK_REPO_URL; then
-if [ -f "$SERVICE_FILE_PATH" ] && [ -f "$SERVICE1_FILE_PATH" ]; then
+      echo "克隆墨水屏时钟仓库失败" >&2
-  # 复制服务文件到 systemd 目录
+      exit 1
-  if sudo cp "$SERVICE_FILE_PATH" /etc/systemd/system/ && sudo cp "$SERVICE1_FILE_PATH" /etc/systemd/system/; then
+    fi
-    # 重载 systemd 管理器配置
+    # 设置start.sh和clean.sh脚本的执行权限
-    sudo systemctl daemon-reload
+    chmod +x "$HOME/2.13-Ink-screen-clock/bin/start.sh"
-    # 启动服务
+    chmod +x "$HOME/2.13-Ink-screen-clock/bin/clean.sh"
-    sudo systemctl enable $SERVICE_PATH
-    sudo systemctl enable $SERVICE1_PATH
-    sudo systemctl start $SERVICE_PATH
   else
-    echo "复制服务文件失败" >&2
+    echo "墨水屏时钟仓库文件夹已存在，跳过克隆"
+  fi
+
+  # 检查服务文件是否存在
+  if [ -f "$service_file_path" ] && [ -f "$service1_file_path" ]; then
+    # 检查服务是否已经启用
+    if ! systemctl is-enabled $service_path &>/dev/null && ! systemctl is-enabled $service1_path &>/dev/null; then
+      # 复制服务文件到 systemd 目录
+      if sudo cp "$service_file_path" /etc/systemd/system/ && sudo cp "$service1_file_path" /etc/systemd/system/; then
+        # 重载 systemd 管理器配置
+        sudo systemctl daemon-reload
+        # 启动服务
+        sudo systemctl enable $service_path
+        sudo systemctl enable $service1_path
+        sudo systemctl start $service_path
+      else
+        echo "复制服务文件失败" >&2
+        exit 1
+      fi
+    else
+      echo "服务文件已存在并启用，跳过复制"
+    fi
+  else
+    echo "服务文件不存在于路径: $service_file_path 或 $service1_file_path" >&2
     exit 1
   fi
-else
-  echo "服务文件不存在于路径: $SERVICE_FILE_PATH 或 $SERVICE1_FILE_PATH" >&2
-  exit 1
-fi
 }
 
 # 主逻辑
 # 检测是否是Debian系统
 if [ -f /etc/debian_version ]; then
-  debug "检测到Debian系统"
+  echo "检测到Debian系统"
 
   # 提取版本号的小数点前的部分
   if ! MAJOR_VERSION=$(echo $DEBIAN_VERSION | cut -d '.' -f 1); then
@@ -175,19 +219,19 @@ if [ -f /etc/debian_version ]; then
 
   # 检测是否是Raspberry Pi系统
   if is_raspberry_pi; then
-    debug "检测到Raspberry Pi系统"
+    echo "检测到Raspberry Pi系统"
 
     # 根据版本号的小数点前的部分执行不同的命令
     case "$MAJOR_VERSION" in
       11)
-        debug "执行Debian 11 (Bullseye) 相关操作"
+        echo "执行Debian 11 (Bullseye) 相关操作"
         update_sources_list "bullseye"
         install_packages
         install_pip_packages
         setup_service
         ;;
       12)
-        debug "执行Debian 12 (Bookworm) 相关操作"
+        echo "执行Debian 12 (Bookworm) 相关操作"
         update_sources_list "bookworm"
         install_packages
         install_pip_packages