BG5 commited on
Commit
2f9a023
·
verified ·
1 Parent(s): 7588baa

Update install.sh

Browse files
Files changed (1) hide show
  1. install.sh +7 -7
install.sh CHANGED
@@ -555,7 +555,7 @@ 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
- exit 0
559
  echo -e "安装花费时间:\033[32m $out_time \033[0m秒"
560
  }
561
 
@@ -706,7 +706,7 @@ Install_Main(){
706
 
707
  Install_Tip
708
 
709
- go="wait" # 确认安装的等待
710
  # while [ ${#} -gt 0 ]; do
711
  # case $1 in
712
  # -u|--user)
@@ -747,13 +747,13 @@ go="wait" # 确认安装的等待
747
  # exit;
748
  # fi
749
 
750
- Get_LocalInfo
751
 
752
- d='{"hostname": "'${hostname_check}'", "cpu": "'${CPU_INFO}'", "memory": "'${MEM_TOTAL}'", "diskUsage": "'${DISK_USE}'", "sysInfo": "'${SYS_INFO}'", "os": "'${SYS_VERSION}'", "idc": "'${IDC_CODE}'"}'
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
 
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
  echo -e "安装花费时间:\033[32m $out_time \033[0m秒"
560
  }
561
 
 
706
 
707
  Install_Tip
708
 
709
+ # go="wait" # 确认安装的等待
710
  # while [ ${#} -gt 0 ]; do
711
  # case $1 in
712
  # -u|--user)
 
747
  # exit;
748
  # fi
749
 
750
+ # Get_LocalInfo
751
 
752
+ # d='{"hostname": "'${hostname_check}'", "cpu": "'${CPU_INFO}'", "memory": "'${MEM_TOTAL}'", "diskUsage": "'${DISK_USE}'", "sysInfo": "'${SYS_INFO}'", "os": "'${SYS_VERSION}'", "idc": "'${IDC_CODE}'"}'
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 "666666666666666666666666666666666666666666"
757
+ exit 0
758
  # 安装完成删除安装包
759
  rm -f $SETUP_PATH/download/xp-panel.tar.gz