From 03d2da6c13e21ea576639fa981ae3a8ebf0b2206 Mon Sep 17 00:00:00 2001
From: mofeng-git <mofeng654321@hotmail.com>
Date: Mon, 10 Jun 2024 15:21:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/override.yaml |  7 +++++++
 install.sh           | 34 ++++++++++++++++++----------------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/config/override.yaml b/config/override.yaml
index 4ee8e24e..c38d947a 100644
--- a/config/override.yaml
+++ b/config/override.yaml
@@ -56,3 +56,10 @@ kvmd:
                 - []
                 - ["#网络唤醒"]
                 - ["#被控机设备", wol_server1|网络唤醒]
+    streamer:
+        forever: true
+        cmd_append: [--slowdown]
+        desired_fps:
+            default: 30
+            max: 60
+            min: 0
diff --git a/install.sh b/install.sh
index 7eb1c61e..a9eae846 100755
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ARCH=$(uname -s)
+ARCH=$(uname -n)
 MACHINE=$(uname -o -s -r -m)
 PYVER=$(python3 -V)
 CURRENTWD=$PWD
@@ -9,14 +9,14 @@ FIND_STR="onecloud_gpio.sh"
 
 #检查架构和Python版本
 check_environment(){
-  echo -e "\e[0;32m设备名称：$MACHINE\nPython版本：$PYVER"
+  echo -e "设备名称：$MACHINE\nPython版本：$PYVER"
   if [ ! $ARCH = "onecloud" ]; then
-    echo -e "\e[0;31m此脚本暂不支持armv7l架构以外的设备！\n退出脚本！" 
+    echo -e "此脚本暂不支持armv7l架构以外的设备！\n退出脚本！" 
     exit
   fi
 
   if [[ "$PYVER" != *"3.10"* && $(which python3.10) != *"python"* ]]; then
-    echo -e "您似乎没有安装 Python 3.10！\n退出脚本！\e[0;37m" 
+    echo -e "您似乎没有安装 Python 3.10！\n退出脚本！" 
     exit
   fi
 }
@@ -24,7 +24,7 @@ check_environment(){
 #安装依赖软件
 install_dependencies(){
   bash <(curl -sSL https://gitee.com/SuperManito/LinuxMirrors/raw/main/ChangeMirrors.sh) --source mirrors.tuna.tsinghua.edu.cn --updata-software false --web-protocol http && echo "换源成功！"
-  echo -e "\e[0;32m正在安装依赖软件p......"  
+  echo -e "正在安装依赖软件......"  
   apt install -y python3.10 python3-pip python3-dev patch iptables nginx \
     tesseract-ocr tesseract-ocr-eng janus libevent-dev libgpiod-dev \
     tesseract-ocr-chi-sim  libjpeg-dev libfreetype6-dev
@@ -38,15 +38,15 @@ install_pikvm(){
   systemctl disable nginx kvmd-janus
   #rm -f /lib/systemd/system/nginx.service 
   #rm -f /lib/systemd/system/kvmd-janus.service &&  systemctl daemon-reload
-  echo "PiKVM安装成功！"
+  echo "PiKVM安装成功"
   cd $CURRENTWD
   cp -f ./patch/onecloud_gpio.sh /usr/bin
   chmod +x /usr/bin/onecloud_gpio.sh 
-  echo "GPIO脚本移动成功！"
+  echo "GPIO脚本移动成功"
   cp -f ./patch/hw.py /usr/local/lib/python3.10/kvmd-packages/kvmd/apps/kvmd/info/
   chmod +x /usr/local/lib/python3.10/kvmd-packages/kvmd/apps/kvmd/info/hw.py
   cp -f ./config/main.yaml /etc/kvmd/ && cp -f ./config/override.yaml /etc/kvmd/ 
-  echo "配置文件替换成功！"
+  echo "配置文件替换成功"
   kvmd -m 
 }
 
@@ -60,13 +60,13 @@ add_patches(){
     cd $CURRENTWD
     cp ./patch/3.198msd.patch /usr/local/lib/python3.10/kvmd-packages/ && cd /usr/local/lib/python3.10/kvmd-packages/
     patch -s -p0 < 3.198msd.patch
-    echo "MSD补丁应用成功！"
+    echo "MSD补丁应用成功"
   fi
 
   cd $CURRENTWD
   cp -f ./patch/chinese.patch /usr/share/kvmd/web/ && cd /usr/share/kvmd/web/
   patch -s -p0 < chinese.patch
-  echo  -e "\e[0;32m中文补丁应用成功！"
+  echo  -e "中文补丁应用成功"
   pip3 config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple/
   pip3 install -U Pillow
 
@@ -81,15 +81,15 @@ fix_motd(){
 if [ -e /etc/update-motd.d/10-armbian-header ]; then /etc/update-motd.d/10-armbian-header; fi
 if [ -e /etc/update-motd.d/30-armbian-sysinfo ]; then /etc/update-motd.d/30-armbian-sysinfo; fi
 
-printf "    欢迎使用 One-KVM - 基于开源程序PiKVM的IP-KVM 应用
+printf "    欢迎使用 One-KVM，基于开源程序 PiKVM 的 IP-KVM 应用
     ____________________________________________________________________________
 
-    要修改默认账户（admin）密码可使用 \"kvmd-htpasswd set admin\"
+    要修改默认账户 admin 密码可使用 \"kvmd-htpasswd set admin\"
 
     帮助链接：
       * https://docs.pikvm.org
+      * https://one-kvm.mofeng.run/
       * https://github.com/mofeng-git/One-KVM
-
 "
 EOF
 	chmod +x /usr/bin/armbian-motd  /etc/update-motd.d/10-armbian-header /etc/update-motd.d/30-armbian-sysinfo
@@ -99,9 +99,10 @@ EOF
 
 #玩客云特定配置
 onecloud_conf(){
-  if [ ! $ARCH = "cloud" ]; then
-    exit
+  if [ ! $ARCH = "onecloud" ]; then
+    echo -e "\n"
   else
+    echo "为玩客云配置开机脚本"
     cat <<EOF >/etc/rc.local
 #!/bin/sh -e
 echo "default-on" >/sys/class/leds/onecloud\:green\:alive/trigger
@@ -113,13 +114,14 @@ systemctl disabled kvmd
 systemctl start kvmd
 exit 0
 EOF
+    echo -e "\n"
   fi
 }
 
 #打印完成信息
 show_info(){
   ipaddr=`ip addr | grep "scope global" | awk '{print $2}' |awk -F/ '{print $1}'`
-  echo  -e "\e[0;32m内网访问地址为：\nhttp://$ipaddr\nhttps://$ipaddr"
+  echo  -e "默认访问地址为：\nhttps://$ipaddr"
 }
 
 check_environment