Update install.sh
Browse files- install.sh +20 -24
install.sh
CHANGED
@@ -437,24 +437,24 @@ Init_XP(){
|
|
437 |
fi
|
438 |
|
439 |
# 设置面板端口
|
440 |
-
panel_port=""
|
441 |
-
if [ "${PANEL_PORT}" ];then
|
442 |
-
|
443 |
-
|
444 |
-
|
445 |
-
|
446 |
-
|
447 |
-
|
448 |
-
else
|
449 |
-
|
450 |
-
|
451 |
-
|
452 |
-
|
453 |
-
|
454 |
-
|
455 |
-
|
456 |
-
|
457 |
-
fi
|
458 |
|
459 |
# 设置面板用户名
|
460 |
panel_user=$(cat /dev/urandom | head -n 16 | md5sum | head -c 8)
|
@@ -555,8 +555,6 @@ End(){
|
|
555 |
((out_time=($end_time-$start_time)))
|
556 |
echo -e "安装花费时间:\033[32m $out_time \033[0m秒"
|
557 |
echo -e "安装日志路径:\033[32m $INSTALL_LOG_PATH \033[0m"
|
558 |
-
# 继续执行其他任务或退出
|
559 |
-
exit 0
|
560 |
}
|
561 |
|
562 |
Install_Tip(){
|
@@ -700,7 +698,7 @@ Install_Main(){
|
|
700 |
Add_Service
|
701 |
End
|
702 |
|
703 |
-
Analysis_Log
|
704 |
}
|
705 |
|
706 |
Install_Tip
|
@@ -754,6 +752,4 @@ curl -s -X POST -H "Content-Type: application/json" -d "${d}" "${API_HOST}/api/a
|
|
754 |
Install_Main
|
755 |
|
756 |
# 安装完成删除安装包
|
757 |
-
rm -f $SETUP_PATH/download/xp-panel.tar.gz
|
758 |
-
# 继续执行其他任务或退出
|
759 |
-
exit 0
|
|
|
437 |
fi
|
438 |
|
439 |
# 设置面板端口
|
440 |
+
panel_port="7860"
|
441 |
+
# if [ "${PANEL_PORT}" ];then
|
442 |
+
# # 检查端口是否被占用
|
443 |
+
# result=$(netstat -tln | grep ":${PANEL_PORT}")
|
444 |
+
# if [ -n "$result" ]; then
|
445 |
+
# Red_Err "安装面板失败,指定的端口 ${PANEL_PORT} 已被占用"
|
446 |
+
# fi
|
447 |
+
# panel_port=$PANEL_PORT
|
448 |
+
# else
|
449 |
+
# # 随机生成端口号
|
450 |
+
# panel_port=$(expr $RANDOM % 55535 + 10000)
|
451 |
+
# # 检查端口是否被占用
|
452 |
+
# result=$(netstat -tln | grep ":$panel_port")
|
453 |
+
# while [ -n "$result" ]; do
|
454 |
+
# panel_port=$(expr $RANDOM % 55535 + 10000)
|
455 |
+
# result=$(netstat -tln | grep ":$panel_port")
|
456 |
+
# done
|
457 |
+
# fi
|
458 |
|
459 |
# 设置面板用户名
|
460 |
panel_user=$(cat /dev/urandom | head -n 16 | md5sum | head -c 8)
|
|
|
555 |
((out_time=($end_time-$start_time)))
|
556 |
echo -e "安装花费时间:\033[32m $out_time \033[0m秒"
|
557 |
echo -e "安装日志路径:\033[32m $INSTALL_LOG_PATH \033[0m"
|
|
|
|
|
558 |
}
|
559 |
|
560 |
Install_Tip(){
|
|
|
698 |
Add_Service
|
699 |
End
|
700 |
|
701 |
+
# Analysis_Log
|
702 |
}
|
703 |
|
704 |
Install_Tip
|
|
|
752 |
Install_Main
|
753 |
|
754 |
# 安装完成删除安装包
|
755 |
+
rm -f $SETUP_PATH/download/xp-panel.tar.gz
|
|
|
|