From 00562068d0350dced9aeba09ec64fa61d2dcbdd4 Mon Sep 17 00:00:00 2001
From: bin456789 <bin456789@gmail.com>
Date: Tue, 1 Aug 2023 21:59:49 +0800
Subject: [PATCH] =?UTF-8?q?core:=20=E8=BF=90=E8=A1=8C=E5=87=BA=E9=94=99?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=87=BA=E9=94=99=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 reinstall.sh | 7 +++++--
 trans.sh     | 8 +++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/reinstall.sh b/reinstall.sh
index ebecc9f..4ed8d59 100644
--- a/reinstall.sh
+++ b/reinstall.sh
@@ -4,6 +4,7 @@ confhome=https://raw.githubusercontent.com/bin456789/reinstall/main
 localtest_confhome=http://192.168.253.1
 
 trap 'error line $LINENO return $?' ERR
+this_script=$(realpath $0)
 
 usage_and_exit() {
     cat <<EOF
@@ -30,9 +31,11 @@ info() {
 error() {
     color='\e[31m'
     plain='\e[0m'
+    echo -e "${color}Error: $*${plain}"
     # 如果从trap调用，显示错误行
-    [ "$1" = line ] && sed -n "$2"p $0
-    echo -e "${color}Error: $*$plain"
+    if [ "$1" = line ]; then
+        sed -n "$2"p $this_script
+    fi
 }
 
 error_and_exit() {
diff --git a/trans.sh b/trans.sh
index c5e3da4..a9994df 100644
--- a/trans.sh
+++ b/trans.sh
@@ -6,6 +6,7 @@
 # 命令出错终止运行，将进入到登录界面，防止失联
 set -eE
 trap 'error line $LINENO return $?' ERR
+this_script=$(realpath $0)
 
 catch() {
     if [ "$1" != "0" ]; then
@@ -16,10 +17,11 @@ catch() {
 error() {
     color='\e[31m'
     plain='\e[0m'
-    # 如果从trap调用，显示错误行
-    [ "$1" = line ] && sed -n "$2"p $0
     echo -e "${color}Error: $*${plain}"
-    wall "Error: $*"
+    # 如果从trap调用，显示错误行
+    if [ "$1" = line ]; then
+        sed -n "$2"p $this_script
+    fi
 }
 
 error_and_exit() {