x

models/version.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"errors"
 	"os"
 	"os/exec"
 	"regexp"
@@ -62,24 +63,22 @@ func Update(msgs ...interface{}) error {
 	sendMessagee("小滴滴开始拉取代码", msgs...)
 	rtn, err := exec.Command("sh", "-c", "cd "+ExecPath+" && git stash && git pull").Output()
 	if err != nil {
-		return err
+		return errors.New("小滴滴拉取代失败：" + err.Error())
 	}
 	t := string(rtn)
 	if !strings.Contains(t, "changed") {
 		if strings.Contains(t, "Already") || strings.Contains(t, "已经是最新") {
-			sendMessagee("小滴滴已是最新版啦", msgs...)
+			return errors.New("小滴滴已是最新版啦")
 		} else {
-			sendMessagee("小滴滴拉取代失败：", msgs...)
+			return errors.New("小滴滴拉取代失败：" + t)
 		}
-		return nil
 	} else {
 		sendMessagee("小滴滴拉取代码成功", msgs...)
 	}
 	sendMessagee("小滴滴正在编译程序", msgs...)
 	rtn, err = exec.Command("sh", "-c", "cd "+ExecPath+" && go build -o "+pname).Output()
 	if err != nil {
-		sendMessagee("小滴滴编译失败：", msgs...)
-		return nil
+		return errors.New("小滴滴编译失败：" + err.Error())
 	} else {
 		sendAdminMessagee("小滴滴编译成功", msgs...)
 	}