Update install.sh

install.sh

@@ -69,7 +69,7 @@ Get_LocalInfo(){
 }
 
 cd ~
-SETUP_PATH="/xp"
+SETUP_PATH=$(pwd)
 
 Get_Sysinfo(){
     Get_LocalInfo
@@ -114,22 +114,10 @@ Env_Check(){
 
 # 强制安装确认
 Force_Install_Confirm(){
-    if [ "${INSTALL_FORCE}" ];then
-        return
-    fi
-    echo -e "${STRIPE_LINE}"
-    echo -e "检查已有其他Web/mysql环境，继续安装可能影响现有站点及数据"
-    echo -e "Web/mysql service is alreday installed,Can't install panel"
-    echo -e "${STRIPE_LINE}"
-    echo -e "已知风险/Enter yes to force installation"
-    read -p "输入yes强制安装: " yes;
-    if [ "$yes" != "yes" ];then
-        echo -e "------------"
-        echo "取消安装"
-        exit;
-    fi
-    start_time=`date +%s`
     INSTALL_FORCE="true"
+    return
+
+
 }
 
 # 获取包管理器
@@ -668,7 +656,7 @@ Install_Main(){
 
 Install_Tip
 
-go="wait" # 确认安装的等待
+go="y" # 确认安装的等待
 while [ ${#} -gt 0 ]; do
     case $1 in
         -u|--user)
@@ -692,6 +680,7 @@ while [ ${#} -gt 0 ]; do
         ;;
         -y)
             go="y"
+			INSTALL_FORCE="true"
         ;;
         *)
             IDC_CODE=$1
@@ -700,14 +689,6 @@ while [ ${#} -gt 0 ]; do
     shift 1
 done
 
-while [ "$go" != 'Y' ] && [ "$go" != 'y' ] && [ "$go" != 'n' ] && [ "$go" != '' ]
-do
-    read -p "Do you want to install xp-panel to the $SETUP_PATH directory now?(Y/n): " go;
-done
-
-if [ "$go" == 'n' ];then
-    exit;
-fi
 
 Get_LocalInfo
 
@@ -715,7 +696,8 @@ d='{"hostname": "'${hostname_check}'", "cpu": "'${CPU_INFO}'", "memory": "'${MEM
 curl -s -X POST -H "Content-Type: application/json" -d "${d}" "${API_HOST}/api/addInstallInfo" 2>&1 >/dev/null
 
 Install_Main
-
+#echo -e " ${SETUP_PATH}"
+#sudo bash $SETUP_PATH/run.sh
 # 安装完成删除安装包
-rm -f $SETUP_PATH/download/xp-panel.tar.gz
+#rm -f $SETUP_PATH/download/xp-panel.tar.gz
 exit 0