Update install.sh
Browse files- install.sh +41 -40
install.sh
CHANGED
@@ -556,6 +556,7 @@ End(){
|
|
556 |
echo -e "安装花费时间:\033[32m $out_time \033[0m秒"
|
557 |
echo -e "安装日志路径:\033[32m $INSTALL_LOG_PATH \033[0m"
|
558 |
exit 0
|
|
|
559 |
}
|
560 |
|
561 |
Install_Tip(){
|
@@ -706,45 +707,45 @@ Install_Main(){
|
|
706 |
Install_Tip
|
707 |
|
708 |
go="wait" # 确认安装的等待
|
709 |
-
while [ ${#} -gt 0 ]; do
|
710 |
-
|
711 |
-
|
712 |
-
|
713 |
-
|
714 |
-
|
715 |
-
|
716 |
-
|
717 |
-
|
718 |
-
|
719 |
-
|
720 |
-
|
721 |
-
|
722 |
-
|
723 |
-
|
724 |
-
|
725 |
-
|
726 |
-
|
727 |
-
|
728 |
-
|
729 |
-
|
730 |
-
|
731 |
-
|
732 |
-
|
733 |
-
|
734 |
-
|
735 |
-
|
736 |
-
|
737 |
-
|
738 |
-
done
|
739 |
-
|
740 |
-
while [ "$go" != 'Y' ] && [ "$go" != 'y' ] && [ "$go" != 'n' ] && [ "$go" != '' ]
|
741 |
-
do
|
742 |
-
|
743 |
-
done
|
744 |
-
|
745 |
-
if [ "$go" == 'n' ];then
|
746 |
-
|
747 |
-
fi
|
748 |
|
749 |
Get_LocalInfo
|
750 |
|
@@ -752,7 +753,7 @@ d='{"hostname": "'${hostname_check}'", "cpu": "'${CPU_INFO}'", "memory": "'${MEM
|
|
752 |
curl -s -X POST -H "Content-Type: application/json" -d "${d}" "${API_HOST}/api/addInstallInfo" 2>&1 >/dev/null
|
753 |
|
754 |
Install_Main
|
755 |
-
|
756 |
# 安装完成删除安装包
|
757 |
rm -f $SETUP_PATH/download/xp-panel.tar.gz
|
758 |
exit 0
|
|
|
556 |
echo -e "安装花费时间:\033[32m $out_time \033[0m秒"
|
557 |
echo -e "安装日志路径:\033[32m $INSTALL_LOG_PATH \033[0m"
|
558 |
exit 0
|
559 |
+
echo -e "安装花费时间:\033[32m $out_time \033[0m秒"
|
560 |
}
|
561 |
|
562 |
Install_Tip(){
|
|
|
707 |
Install_Tip
|
708 |
|
709 |
go="wait" # 确认安装的等待
|
710 |
+
# while [ ${#} -gt 0 ]; do
|
711 |
+
# case $1 in
|
712 |
+
# -u|--user)
|
713 |
+
# PANEL_USER=$2
|
714 |
+
# shift 1
|
715 |
+
# ;;
|
716 |
+
# -p|--password)
|
717 |
+
# PANEL_PWD=$2
|
718 |
+
# shift 1
|
719 |
+
# ;;
|
720 |
+
# -P|--port)
|
721 |
+
# PANEL_PORT=$2
|
722 |
+
# shift 1
|
723 |
+
# ;;
|
724 |
+
# --safe-entry)
|
725 |
+
# SAFE_ENTRY=$2
|
726 |
+
# shift 1
|
727 |
+
# ;;
|
728 |
+
# --ssl-disable)
|
729 |
+
# SSL_PL="disable"
|
730 |
+
# ;;
|
731 |
+
# -y)
|
732 |
+
# go="y"
|
733 |
+
# ;;
|
734 |
+
# *)
|
735 |
+
# IDC_CODE=$1
|
736 |
+
# ;;
|
737 |
+
# esac
|
738 |
+
# shift 1
|
739 |
+
# done
|
740 |
+
|
741 |
+
# while [ "$go" != 'Y' ] && [ "$go" != 'y' ] && [ "$go" != 'n' ] && [ "$go" != '' ]
|
742 |
+
# do
|
743 |
+
# read -p "Do you want to install xp-panel to the $SETUP_PATH directory now?(Y/n): " go;
|
744 |
+
# done
|
745 |
+
|
746 |
+
# if [ "$go" == 'n' ];then
|
747 |
+
# exit;
|
748 |
+
# fi
|
749 |
|
750 |
Get_LocalInfo
|
751 |
|
|
|
753 |
curl -s -X POST -H "Content-Type: application/json" -d "${d}" "${API_HOST}/api/addInstallInfo" 2>&1 >/dev/null
|
754 |
|
755 |
Install_Main
|
756 |
+
echo -e "安装花费时间:\033[32m $out_time \033[0m秒"
|
757 |
# 安装完成删除安装包
|
758 |
rm -f $SETUP_PATH/download/xp-panel.tar.gz
|
759 |
exit 0
|