From cf9d2e6db32c87ee4f9d5544f21bad37b4cf6e7c Mon Sep 17 00:00:00 2001
From: naiba <hi@nai.ba>
Date: Mon, 25 Jan 2021 14:09:11 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=B8=20fix:=20i686=20=E7=9A=84=2032=20?=
 =?UTF-8?q?=E4=BD=8D=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script/install.sh | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/script/install.sh b/script/install.sh
index 2009dd3..44c35b8 100755
--- a/script/install.sh
+++ b/script/install.sh
@@ -10,7 +10,7 @@ NZ_BASE_PATH="/opt/nezha"
 NZ_DASHBOARD_PATH="${NZ_BASE_PATH}/dashboard"
 NZ_AGENT_PATH="${NZ_BASE_PATH}/agent"
 NZ_AGENT_SERVICE="/etc/systemd/system/nezha-agent.service"
-NZ_VERSION="v1.0.2"
+NZ_VERSION="v1.1.0"
 GITHUB_RAW_URL="raw.githubusercontent.com"
 GITHUB_URL="github.com"
 
@@ -77,9 +77,7 @@ pre_check() {
     ## os_arch
     if [ $(uname -m | grep 'x86_64') != "" ]; then
         os_arch="amd64"
-    elif [ $(uname -m | grep 'i686') != "" ]; then
-        os_arch="amd64"
-    elif [ $(uname -m | grep 'i386') != "" ]; then
+    elif [ $(uname -m | grep 'i386\|i686') != "" ]; then
         os_arch="386"
     elif [ $(uname -m | grep 'aarch64') != "" ]; then
         os_arch="arm64"
@@ -364,6 +362,16 @@ uninstall_dashboard() {
     fi
 }
 
+show_agent_log() {
+    echo -e "> 获取Agent日志"
+
+    journalctl -xf -u nezha-agent.service
+
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
+}
+
 uninstall_agent() {
     echo -e "> 卸载Agent"
 
@@ -410,6 +418,7 @@ show_usage() {
     echo "--------------------------------------------------------"
     echo "./nbdomain.sh install_agent              - 安装监控Agent"
     echo "./nbdomain.sh modify_agent_config        - 修改Agent配置"
+    echo "./nbdomain.sh show_agent_log             - 查看Agent日志"
     echo "./nbdomain.sh uninstall_agent            - 卸载Agen"
     echo "./nbdomain.sh restart_agent              - 重启Agen"
     echo "--------------------------------------------------------"
@@ -431,10 +440,11 @@ show_menu() {
     ————————————————-
     ${green}8.${plain}  安装监控Agent
     ${green}9.${plain}  修改Agent配置
-    ${green}10.${plain} 卸载Agent
-    ${green}11.${plain} 重启Agent
+    ${green}10.${plain} 查看Agent日志
+    ${green}11.${plain} 卸载Agent
+    ${green}12.${plain} 重启Agent
     "
-    echo && read -p "请输入选择 [0-11]: " num
+    echo && read -p "请输入选择 [0-12]: " num
 
     case "${num}" in
     0)
@@ -468,13 +478,16 @@ show_menu() {
         modify_agent_config
         ;;
     10)
-        uninstall_agent
+        show_agent_log
         ;;
     11)
+        uninstall_agent
+        ;;
+    12)
         restart_agent
         ;;
     *)
-        echo -e "${red}请输入正确的数字 [0-11]${plain}"
+        echo -e "${red}请输入正确的数字 [0-12]${plain}"
         ;;
     esac
 }
@@ -510,6 +523,9 @@ if [[ $# > 0 ]]; then
     "modify_agent_config")
         modify_agent_config 0
         ;;
+    "show_agent_log")
+        show_agent_log 0
+        ;;
     "uninstall_agent")
         uninstall_agent 0
         ;;