mirror of
https://github.com/bin456789/reinstall.git
synced 2025-06-09 22:10:00 +00:00
core: 运行出错时,显示出错命令
This commit is contained in:
parent
52d7581e58
commit
00562068d0
@ -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() {
|
||||
|
8
trans.sh
8
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() {
|
||||
|
Loading…
x
Reference in New Issue
Block a user