update

routers/api/v1/node.go

@@ -167,7 +167,21 @@ func UpdateNode(c *gin.Context){
 	//替换原执行文件
 	log.Println(setting.BityuanSetting.Name+"_"+latestVersion)
 	log.Println(absPath)
-	mv := exec.Command("mv",pwd+setting.BityuanSetting.Name+"_"+latestVersion+"/*",absPath)
+	err = os.Chmod(pwd+setting.BityuanSetting.Name+"_"+latestVersion+"/"+setting.BityuanSetting.Name,0755)
+	if err != nil {
+		appG.Response(http.StatusOK, e.ERROR, err)
+		app.UpdateInfo.Flag = true
+		app.BityuanFlag = false
+		return
+	}
+	err = os.Chmod(pwd+setting.BityuanSetting.Name+"_"+latestVersion+"/"+setting.BityuanSetting.Name+"-cli",0755)
+	if err != nil {
+		appG.Response(http.StatusOK, e.ERROR, err)
+		app.UpdateInfo.Flag = true
+		app.BityuanFlag = false
+		return
+	}
+	mv := exec.Command("mv",pwd+setting.BityuanSetting.Name+"_"+latestVersion+"/"+setting.BityuanSetting.Name,absPath)
 	mverr := bytes.NewBuffer(nil)
 	mv.Stderr = mverr
 	err = mv.Start()
@@ -186,7 +200,25 @@ func UpdateNode(c *gin.Context){
 		app.BityuanFlag = false
 		return
 	}
-
+	mv2 := exec.Command("mv",pwd+setting.BityuanSetting.Name+"_"+latestVersion+"/"+setting.BityuanSetting.Name+"-cli",absPath)
+	mverr2 := bytes.NewBuffer(nil)
+	mv2.Stderr = mverr2
+	err = mv2.Start()
+	if err != nil {
+		log.Println("mv2",err)
+		appG.Response(http.StatusOK, e.MV_ERROR, err)
+		app.UpdateInfo.Flag = true
+		app.BityuanFlag = false
+		return
+	}
+	err = mv2.Wait()
+	if err != nil {
+		log.Println("stderr2:",mverr2.String())
+		appG.Response(http.StatusOK, e.MV_ERROR, mverr2.String())
+		app.UpdateInfo.Flag = true
+		app.BityuanFlag = false
+		return
+	}
 	//mv2 := exec.Command("mv",setting.BityuanSetting.Name+"_"+latestVersion+"/"+"bityuan.toml",".")
 	//err = mv2.Start()
 	//if err != nil {
@@ -225,6 +257,7 @@ func UpdateNode(c *gin.Context){
 		appG.Response(http.StatusOK, e.NODE_ERROR,"start auto sh err")
 		return
 	}
+	app.DPercent.Flag = false
 	appG.Response(http.StatusOK,e.SUCCESS,"update job started")
 }