61
61
Default ("deb,rpm,apk" ).
62
62
Short ('p' ).
63
63
Enum ("deb" , "rpm" , "apk" , "deb,rpm,apk" )
64
+ releaseDir = app .Flag ("releaseDir" , "Release directory (that contains os-arch specific dirs) to pick up binaries to package, defaults to `appName+\" -release\" `" ).
65
+ Short ('d' ).String ()
64
66
)
65
67
66
68
const tmpl = `name: "{{ .App }}"
@@ -76,7 +78,7 @@ license: "AGPLv3"
76
78
rpm:
77
79
group: Applications/File
78
80
contents:
79
- - src: {{ .ReleaseDir }}-release /{{ .OS }}-{{ .Arch }}/{{ .Binary }}.{{ .Release }}
81
+ - src: {{ .ReleaseDir }}/{{ .OS }}-{{ .Arch }}/{{ .Binary }}.{{ .Release }}
80
82
dst: /usr/local/bin/{{ .App }}
81
83
{{if eq .Binary "minio" }}
82
84
- src: minio.service
@@ -369,6 +371,17 @@ C:\mc.exe alias set myminio/ http://MINIO-SERVER MYUSER MYPASSWORD`, winArch),
369
371
return d
370
372
}
371
373
374
+ func releaseDirName () string {
375
+ if * releaseDir != "" {
376
+ return * releaseDir
377
+ }
378
+ name := * appName
379
+ if * appName == "minio-enterprise" {
380
+ name = "minio"
381
+ }
382
+ return name + "-release"
383
+ }
384
+
372
385
func main () {
373
386
app .Version (version )
374
387
app .VersionFlag .Short ('v' )
@@ -377,14 +390,6 @@ func main() {
377
390
kingpin .Fatalf (err .Error ())
378
391
}
379
392
380
- releasePath := func () string {
381
- if * appName == "minio-enterprise" {
382
- return "aistor"
383
- }
384
- return * appName
385
- }() + "-release"
386
- os .MkdirAll (releasePath , 0o755 )
387
-
388
393
semVerTag := semVerRelease (* release )
389
394
if err := doPackage (* appName , * release , * packager ); err != nil {
390
395
if ! * ignoreMissingArch {
@@ -407,9 +412,9 @@ func main() {
407
412
kingpin .Fatalf (err .Error ())
408
413
}
409
414
410
- os .WriteFile (filepath .Join (releasePath , "downloads-" + * appName + ".json" ), buf , 0o644 )
415
+ os .WriteFile (filepath .Join (releaseDirName () , "downloads-" + * appName + ".json" ), buf , 0o644 )
411
416
412
- fmt .Println ("Generated downloads metadata at" , filepath .Join (releasePath , "downloads-" + * appName + ".json" ))
417
+ fmt .Println ("Generated downloads metadata at" , filepath .Join (releaseDirName () , "downloads-" + * appName + ".json" ))
413
418
}
414
419
415
420
type releaseTmpl struct {
@@ -484,12 +489,7 @@ func doPackage(appName, release, packager string) error {
484
489
}
485
490
return appName
486
491
}(),
487
- ReleaseDir : func () string {
488
- if appName == "minio-enterprise" {
489
- return "aistor"
490
- }
491
- return appName
492
- }(),
492
+ ReleaseDir : releaseDirName (),
493
493
Binary : func () string {
494
494
if appName == "minio-enterprise" {
495
495
return "minio"
@@ -547,12 +547,7 @@ func doPackage(appName, release, packager string) error {
547
547
}
548
548
549
549
releasePkg := pkg .ConventionalFileName (info )
550
- tgtPath := filepath .Join (func () string {
551
- if appName == "minio-enterprise" {
552
- return "aistor"
553
- }
554
- return appName
555
- }()+ "-release" , "linux-" + arch , releasePkg )
550
+ tgtPath := filepath .Join (releaseDirName (), "linux-" + arch , releasePkg )
556
551
f , err := os .Create (tgtPath )
557
552
if err != nil {
558
553
return err
0 commit comments