Skip to content

Commit dbc0d64

Browse files
tonycai653tonycai653
committed
Makefile
1 parent 83ccf06 commit dbc0d64

File tree

4 files changed

+49
-27
lines changed

4 files changed

+49
-27
lines changed

‎Makefile‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,42 @@
1-
WIN86=qshell_windows_x86.exe
2-
WIN64=qshell_windows_x64.exe
3-
DARWIN=qshell_darwin_x64
4-
LINUX86=qshell_linux_x86
5-
LINUX64=qshell_linux_x64
6-
LINUXARM=qshell_linux_arm
1+
VERSION=v2.3.8
2+
WIN86=qshell-windows-x86-$(VERSION).exe
3+
WIN64=qshell-windows-x64-$(VERSION).exe
4+
DARWIN=qshell-darwin-x64-$(VERSION)
5+
LINUX86=qshell-linux-x86-$(VERSION)
6+
LINUX64=qshell-linux-x64-$(VERSION)
7+
LINUXARM=qshell-linux-arm-$(VERSION)
78
LDFLAGS='-extldflags "-static"'
89
GO=GO111MODULE=on go
910

1011
all: linux windows arm darwin
1112

1213
darwin:
13-
GOOS=darwin GOARCH=amd64 $(GO) build -o $(DARWIN)
14+
@GOOS=darwin GOARCH=amd64 $(GO) build -o $(DARWIN)
15+
@zip $(DARWIN).zip $(DARWIN)
1416

1517
linux:
16-
CGO_ENABLED=0 GOOS=linux GOARCH=386 $(GO) build -ldflags $(LDFLAGS) -o $(LINUX86) .
17-
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GO) build -ldflags $(LDFLAGS) -o $(LINUX64) .
18+
@CGO_ENABLED=0 GOOS=linux GOARCH=386 $(GO) build -ldflags $(LDFLAGS) -o $(LINUX86) .
19+
@CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GO) build -ldflags $(LDFLAGS) -o $(LINUX64) .
20+
@zip $(LINUX86).zip $(LINUX86)
21+
@zip $(LINUX64).zip $(LINUX64)
22+
1823

1924
windows:
20-
CGO_ENABLED=0 GOOS=windows GOARCH=386 $(GO) build -ldflags $(LDFLAGS) -o $(WIN86) .
21-
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 $(GO) build -ldflags $(LDFLAGS) -o $(WIN64) .
25+
@CGO_ENABLED=0 GOOS=windows GOARCH=386 $(GO) build -ldflags $(LDFLAGS) -o $(WIN86) .
26+
@CGO_ENABLED=0 GOOS=windows GOARCH=amd64 $(GO) build -ldflags $(LDFLAGS) -o $(WIN64) .
27+
@zip $(WIN86).zip $(WIN86)
28+
@zip $(WIN64).zip $(WIN64)
2229

2330
arm:
24-
CGO_ENABLED=0 GOOS=linux GOARCH=arm $(GO) build -ldflags $(LDFLAGS) -o $(LINUXARM)
31+
@CGO_ENABLED=0 GOOS=linux GOARCH=arm $(GO) build -ldflags $(LDFLAGS) -o $(LINUXARM)
32+
@zip $(LINUXARM).zip $(LINUXARM)
33+
34+
cleanzip:
35+
@rm $(LINUX86).zip $(LINUX64).zip $(LINUXARM).zip 2> /dev/null || true
36+
@rm $(WIN86).zip $(WIN64).zip 2> /dev/null || true
37+
@rm $(DARWIN).zip 2> /dev/null || true
38+
39+
cleanbin:
40+
@rm $(LINUX86) $(LINUX64) $(LINUXARM) $(DARWIN) $(WIN86) $(WIN64) 2> /dev/null || true
41+
42+
clean: cleanzip cleanbin

‎cmd/rsbatch.go‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"sync"
1212
"time"
1313

14-
"github.com/astaxie/beego/logs"
1514
"github.com/qiniu/api.v7/storage"
1615
"github.com/qiniu/qshell/iqshell"
1716
"github.com/spf13/cobra"
@@ -531,10 +530,10 @@ func batchDelete(entries []iqshell.EntryPath, bm *iqshell.BucketManager, fileExp
531530
item := ret[i]
532531

533532
if item.Code != 200 || item.Data.Error != "" {
534-
logs.Error("Delete '%s' => '%s' failed, Code: %d, Error: %s", entry.Bucket, entry.Key, item.Code, item.Data.Error)
533+
fmt.Fprintf(os.Stderr, "Delete '%s' => '%s' failed, Code: %d, Error: %s\n", entry.Bucket, entry.Key, item.Code, item.Data.Error)
535534
fileExporter.WriteToFailedWriter(fmt.Sprintf("%s\t%d\t%s\n", entry.Key, item.Code, item.Data.Error))
536535
} else {
537-
logs.Debug("Delete '%s' => '%s' success", entry.Bucket, entry.Key)
536+
fmt.Printf("Delete '%s' => '%s' success\n", entry.Bucket, entry.Key)
538537
fileExporter.WriteToSuccessWriter(fmt.Sprintf("%s\n", entry.Key))
539538
}
540539
}
@@ -654,10 +653,10 @@ func batchChgm(entries []iqshell.ChgmEntryPath, bm *iqshell.BucketManager, fileE
654653
item := ret[i]
655654
if item.Code != 200 || item.Data.Error != "" {
656655
fileExporter.WriteToFailedWriter(fmt.Sprintf("%s\t%d\t%s\n", entry.Key, item.Code, item.Data.Error))
657-
logs.Error("Chgm '%s' => '%s' Failed, Code: %d, Error: %s", entry.Key, entry.MimeType, item.Code, item.Data.Error)
656+
fmt.Fprintf(os.Stderr, "Chgm '%s' => '%s' Failed, Code: %d, Error: %s\n", entry.Key, entry.MimeType, item.Code, item.Data.Error)
658657
} else {
659658
fileExporter.WriteToSuccessWriter(fmt.Sprintf("%s\n", entry.Key))
660-
logs.Debug("Chgm '%s' => '%s' success", entry.Key, entry.MimeType)
659+
fmt.Printf("Chgm '%s' => '%s' success\n", entry.Key, entry.MimeType)
661660
}
662661
}
663662
}
@@ -786,10 +785,10 @@ func batchChtype(entries []iqshell.ChtypeEntryPath, bm *iqshell.BucketManager, f
786785
item := ret[i]
787786
if item.Code != 200 || item.Data.Error != "" {
788787
fileExporter.WriteToFailedWriter(fmt.Sprintf("%s\t%d\t%s\n", entry.Key, item.Code, item.Data.Error))
789-
logs.Error("Chtype '%s' => '%d' Failed, Code: %d, Error: %s\n", entry.Key, entry.FileType, item.Code, item.Data.Error)
788+
fmt.Fprintf(os.Stderr, "Chtype '%s' => '%d' Failed, Code: %d, Error: %s\n", entry.Key, entry.FileType, item.Code, item.Data.Error)
790789
} else {
791790
fileExporter.WriteToSuccessWriter(fmt.Sprintf("%s\n", entry.Key))
792-
logs.Debug("Chtype '%s' => '%s' success", entry.Key, entry.FileType)
791+
fmt.Printf("Chtype '%s' => '%s' success\n", entry.Key, entry.FileType)
793792
}
794793
}
795794
}
@@ -904,9 +903,9 @@ func batchDeleteAfterDays(entries []iqshell.DeleteAfterDaysEntryPath, bm *iqshel
904903
for i, entry := range entries {
905904
item := ret[i]
906905
if item.Code != 200 || item.Data.Error != "" {
907-
logs.Error("Expire '%s' => '%d' Failed, Code: %d, Error: %s", entry.Key, entry.DeleteAfterDays, item.Code, item.Data.Error)
906+
fmt.Fprintf(os.Stderr, "Expire '%s' => '%d' Failed, Code: %d, Error: %s\n", entry.Key, entry.DeleteAfterDays, item.Code, item.Data.Error)
908907
} else {
909-
logs.Debug("Expire '%s' => '%d' success", entry.Key, entry.DeleteAfterDays)
908+
fmt.Printf("Expire '%s' => '%d' success\n", entry.Key, entry.DeleteAfterDays)
910909
}
911910
}
912911
}
@@ -1031,10 +1030,10 @@ func batchRename(entries []iqshell.RenameEntryPath, bm *iqshell.BucketManager, f
10311030
item := ret[i]
10321031
if item.Code != 200 || item.Data.Error != "" {
10331032
fileExporter.WriteToFailedWriter(fmt.Sprintf("%s\t%s\t%d\t%s\n", entry.SrcEntry.Key, entry.DstEntry.Key, item.Code, item.Data.Error))
1034-
logs.Error("Rename '%s' => '%s' Failed, Code: %d, Error: %s", entry.SrcEntry.Key, entry.DstEntry.Key, item.Code, item.Data.Error)
1033+
fmt.Fprintf(os.Stderr, "Rename '%s' => '%s' Failed, Code: %d, Error: %s\n", entry.SrcEntry.Key, entry.DstEntry.Key, item.Code, item.Data.Error)
10351034
} else {
10361035
fileExporter.WriteToSuccessWriter(fmt.Sprintf("%s\t%s\n", entry.SrcEntry.Key, entry.DstEntry.Key))
1037-
logs.Debug("Rename '%s' => '%s' success", entry.SrcEntry.Key, entry.DstEntry.Key)
1036+
fmt.Printf("Rename '%s' => '%s' success\n", entry.SrcEntry.Key, entry.DstEntry.Key)
10381037
}
10391038
}
10401039
}
@@ -1165,13 +1164,13 @@ func batchMove(entries []iqshell.MoveEntryPath, bm *iqshell.BucketManager, fileE
11651164
if item.Code != 200 || item.Data.Error != "" {
11661165
fileExporter.WriteToFailedWriter(fmt.Sprintf("%s\t%s\t%d\t%s\n", entry.SrcEntry.Key,
11671166
entry.DstEntry.Key, item.Code, item.Data.Error))
1168-
logs.Error("Move '%s:%s' => '%s:%s' Failed, Code: %d, Error: %s",
1167+
fmt.Fprintf(os.Stderr, "Move '%s:%s' => '%s:%s' Failed, Code: %d, Error: %s",
11691168
entry.SrcEntry.Bucket, entry.SrcEntry.Key,
11701169
entry.DstEntry.Bucket, entry.DstEntry.Key,
11711170
item.Code, item.Data.Error)
11721171
} else {
11731172
fileExporter.WriteToSuccessWriter(fmt.Sprintf("%s\t%s\n", entry.SrcEntry.Key, entry.DstEntry.Key))
1174-
logs.Debug("Move '%s:%s' => '%s:%s' success",
1173+
fmt.Printf("Move '%s:%s' => '%s:%s' success\n",
11751174
entry.SrcEntry.Bucket, entry.SrcEntry.Key, entry.DstEntry.Bucket, entry.DstEntry.Key)
11761175
}
11771176
}
@@ -1304,13 +1303,13 @@ func batchCopy(entries []iqshell.CopyEntryPath, bm *iqshell.BucketManager, fileE
13041303
if item.Code != 200 || item.Data.Error != "" {
13051304
fileExporter.WriteToFailedWriter(fmt.Sprintf("%s\t%s\t%d\t%s\n", entry.SrcEntry.Key,
13061305
entry.DstEntry.Key, item.Code, item.Data.Error))
1307-
logs.Error("Copy '%s:%s' => '%s:%s' Failed, Code: %d, Error: %s",
1306+
fmt.Fprintf(os.Stderr, "Copy '%s:%s' => '%s:%s' Failed, Code: %d, Error: %s\n",
13081307
entry.SrcEntry.Bucket, entry.SrcEntry.Key,
13091308
entry.DstEntry.Bucket, entry.DstEntry.Key,
13101309
item.Code, item.Data.Error)
13111310
} else {
13121311
fileExporter.WriteToSuccessWriter(fmt.Sprintf("%s\t%s\n", entry.SrcEntry.Key, entry.DstEntry.Key))
1313-
logs.Debug("Copy '%s:%s' => '%s:%s' success",
1312+
fmt.Printf("Copy '%s:%s' => '%s:%s' success\n",
13141313
entry.SrcEntry.Bucket, entry.SrcEntry.Key,
13151314
entry.DstEntry.Bucket, entry.DstEntry.Key)
13161315
}

‎go.mod‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ require (
1010
github.com/alexkohler/nakedret v0.0.0-20171106223215-c0e305a4f690 // indirect
1111
github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20181107013735-cab2ffdaf410
1212
github.com/astaxie/beego v1.10.1
13+
github.com/aws/aws-sdk-go v1.20.4
1314
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
1415
github.com/client9/misspell v0.3.4 // indirect
1516
github.com/golang/lint v0.0.0-20181217174547-8f45f776aaf1 // indirect

‎go.sum‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20181107013735-cab2ffdaf410 h1:AHp0Zc
1616
github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20181107013735-cab2ffdaf410/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
1717
github.com/astaxie/beego v1.10.1 h1:M2ciUnyiZycuTpGEA+idJF0gX24h58EbPvGqjnO/DCg=
1818
github.com/astaxie/beego v1.10.1/go.mod h1:0R4++1tUqERR0WYFWdfkcrsyoVBCG4DgpDGokT3yb+U=
19+
github.com/aws/aws-sdk-go v1.20.4 h1:czX3oqFyqz/AELrK/tneNuyZgNIrWnyqP+iQXsQ32E0=
20+
github.com/aws/aws-sdk-go v1.20.4/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
1921
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f h1:ZNv7On9kyUzm7fvRZumSyy/IUiSC7AzL0I1jKKtwooA=
2022
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
2123
github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
@@ -40,6 +42,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
4042
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
4143
github.com/jgautheron/goconst v0.0.0-20170703170152-9740945f5dcb h1:D5s1HIu80AcMGcqmk7fNIVptmAubVHHaj3v5Upex6Zs=
4244
github.com/jgautheron/goconst v0.0.0-20170703170152-9740945f5dcb/go.mod h1:82TxjOpWQiPmywlbIaB2ZkqJoSYJdLGPgAJDvM3PbKc=
45+
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
46+
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
4347
github.com/kisielk/errcheck v1.1.0 h1:ZqfnKyx9KGpRcW04j5nnPDgRgoXUeLh2YFBeFzphcA0=
4448
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
4549
github.com/kisielk/gotool v0.0.0-20161130080628-0de1eaf82fa3/go.mod h1:jxZFDH7ILpTPQTk+E2s+z4CUas9lVNjIuKR4c5/zKgM=

0 commit comments

Comments
 (0)