From 4f4e95b6845b9756fc39b0c12844eab4034491a0 Mon Sep 17 00:00:00 2001
From: iikira <2571583272@qq.com>
Date: Sat, 8 Sep 2018 19:45:42 +0800
Subject: [PATCH] v3.5.5

---
 .github/RELEASE_TEMPLATE.md |  10 +++++-----
 build.sh                    |  11 +++++++----
 main.go                     |   6 +++---
 resource_windows.syso       | Bin 69255 -> 69255 bytes
 versioninfo.json            |   8 ++++----
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/.github/RELEASE_TEMPLATE.md b/.github/RELEASE_TEMPLATE.md
index 5a20f176..4600fb5c 100644
--- a/.github/RELEASE_TEMPLATE.md
+++ b/.github/RELEASE_TEMPLATE.md
@@ -1,10 +1,10 @@
 # 更新日志: 
 
-1. 修复若干问题;
-2. 支持2gb以上的文件上传了;
-3. 支持多个文件并行下载;
-4. 增加清空控制台命令;
-5. 支持搜索文件;
+1. 修复上传的崩溃问题;
+2. 修复无法查询离线下载任务列表;
+3. 修复取消分享失败;
+4. 支持下载完成后自动校验文件;
+5. 支持调整上传和下载的重试次数;
 
 个人项目bug在所难免! 欢迎提 issue 和 pull request!!.
 
diff --git a/build.sh b/build.sh
index f2be193b..f0e2669c 100755
--- a/build.sh
+++ b/build.sh
@@ -3,8 +3,11 @@
 name="BaiduPCS-Go"
 version=$1
 
+GOROOT=/usr/local/go1.10.4
+go=$GOROOT/bin/go
+
 if [ "$1" = "" ];then
-    version=v3.5.4
+    version=v3.5.5
 fi
 
 output="out/"
@@ -19,10 +22,10 @@ Build() {
     export GOOS=$2 GOARCH=$3 GO386=sse2 CGO_ENABLED=0 GOARM=$4
     if [ $2 = "windows" ];then
         goversioninfo -icon=assets/$name.ico -manifest="$name".exe.manifest -product-name="$name" -file-version="$version" -product-version="$version" -company=iikira -copyright="© 2016-2018 iikira." -o=resource_windows.syso
-        go build -ldflags "-X main.Version=$version -s -w" -o "$output/$1/$name.exe"
+        $go build -ldflags "-X main.Version=$version -s -w" -o "$output/$1/$name.exe"
         RicePack $1 $name.exe
     else
-        go build -ldflags "-X main.Version=$version -s -w" -o "$output/$1/$name"
+        $go build -ldflags "-X main.Version=$version -s -w" -o "$output/$1/$name"
         RicePack $1 $name
     fi
 
@@ -32,7 +35,7 @@ Build() {
 ArmBuild() {
     echo "Building $1..."
     export GOOS=$2 GOARCH=$3 GOARM=$4 CGO_ENABLED=1
-    go build -ldflags "-X main.Version=$version -s -w -linkmode=external -extldflags=-pie" -o "$output/$1/$name"
+    $go build -ldflags "-X main.Version=$version -s -w -linkmode=external -extldflags=-pie" -o "$output/$1/$name"
     if [ $2 = "darwin" ] && [ $3 = "arm" -o $3 = "arm64" ];then
         # cp Info.plist "$output/$1"
         ldid -S "$output/$1/$name"
diff --git a/main.go b/main.go
index d0b2b501..40dc1870 100644
--- a/main.go
+++ b/main.go
@@ -37,7 +37,7 @@ import (
 
 var (
 	// Version 版本号
-	Version = "v3.5.4-devel"
+	Version = "v3.5.5-devel"
 
 	historyFilePath = filepath.Join(pcsconfig.GetConfigDir(), "pcs_command_history.txt")
 	reloadFn        = func(c *cli.Context) error {
@@ -1064,7 +1064,7 @@ func main() {
 				cli.IntFlag{
 					Name:  "retry",
 					Usage: "下载失败最大重试次数",
-					Value: 3,
+					Value: pcscommand.DefaultDownloadMaxRetry,
 				},
 				cli.BoolFlag{
 					Name:  "nocheck",
@@ -1163,7 +1163,7 @@ func main() {
 				cli.IntFlag{
 					Name:  "retry",
 					Usage: "上传失败最大重试次数",
-					Value: 3,
+					Value: pcscommand.DefaultUploadMaxRetry,
 				},
 				cli.BoolFlag{
 					Name:  "norapid",
diff --git a/resource_windows.syso b/resource_windows.syso
index 743317b06ba3e9ef1dc4bd32b14312bc68508463..26bb524a6af0105e6fc3cbb2656dcab4d028e626 100644
GIT binary patch
delta 41
xcmZpl%hEoVrC|#rJ0~YA11keF0|Nu=bOBDr*Nmpq|8O#HXEfcug^TerGXTw53RwUE

delta 41
xcmZpl%hEoVrC|#rJ0~X#11keF0|NugbOBDr*Ni69|8O#HXEfQqg^TerGXTvJ3RM6A

diff --git a/versioninfo.json b/versioninfo.json
index ffe5c712..dd61b48b 100644
--- a/versioninfo.json
+++ b/versioninfo.json
@@ -3,13 +3,13 @@
         "FileVersion": {
             "Major": 3,
             "Minor": 5,
-            "Patch": 4,
+            "Patch": 5,
             "Build": 0
         },
         "ProductVersion": {
             "Major": 3,
             "Minor": 5,
-            "Patch": 4,
+            "Patch": 5,
             "Build": 0
         },
         "FileFlagsMask": "3f",
@@ -22,14 +22,14 @@
         "Comments": "",
         "CompanyName": "iikira",
         "FileDescription": "百度网盘客户端",
-        "FileVersion": "v3.5.4",
+        "FileVersion": "v3.5.5",
         "InternalName": "",
         "LegalCopyright": "© 2016-2018 iikira.",
         "LegalTrademarks": "",
         "OriginalFilename": "",
         "PrivateBuild": "",
         "ProductName": "BaiduPCS-Go",
-        "ProductVersion": "v3.5.4",
+        "ProductVersion": "v3.5.5",
         "SpecialBuild": ""
     },
     "VarFileInfo": {