diff --git a/app-builder-bin/package.json b/app-builder-bin/package.json index b236ddf..43d540d 100644 --- a/app-builder-bin/package.json +++ b/app-builder-bin/package.json @@ -1,7 +1,7 @@ { "name": "app-builder-bin", "description": "app-builder precompiled binaries", - "version": "3.4.1", + "version": "3.4.2", "files": [ "*.js", "mac", diff --git a/go.mod b/go.mod index 27086f1..695e8be 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 // indirect github.com/alessio/shellescape v0.0.0-20190409004728-b115ca0f9053 // indirect - github.com/aws/aws-sdk-go v1.21.0 + github.com/aws/aws-sdk-go v1.21.3 github.com/biessek/golang-ico v0.0.0-20180326222316-d348d9ea4670 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -37,7 +37,7 @@ require ( go.uber.org/multierr v1.1.0 // indirect go.uber.org/zap v1.10.0 golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9 // indirect - golang.org/x/net v0.0.0-20190628185345-da137c7871d7 // indirect + golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 // indirect golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7 // indirect golang.org/x/text v0.3.2 // indirect gopkg.in/alessio/shellescape.v1 v1.0.0-20170105083845-52074bc9df61 diff --git a/go.sum b/go.sum index 50c3722..e335c6c 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 h1:Hs82Z41s6SdL1C github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alessio/shellescape v0.0.0-20190409004728-b115ca0f9053 h1:H/GMMKYPkEIC3DF/JWQz8Pdd+Feifov2EIgGfNpeogI= github.com/alessio/shellescape v0.0.0-20190409004728-b115ca0f9053/go.mod h1:xW8sBma2LE3QxFSzCnH9qe6gAE2yO9GvQaWwX89HxbE= -github.com/aws/aws-sdk-go v1.21.0 h1:dRGzi4XZe5GFSJssHkRNUf/hRD/HL8bdqTYa9hpAO8c= -github.com/aws/aws-sdk-go v1.21.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.21.3 h1:Qw/NpqIrCxuZL6sFVvoDlcatEe8woEx1d4gB+tRPsjw= +github.com/aws/aws-sdk-go v1.21.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/biessek/golang-ico v0.0.0-20180326222316-d348d9ea4670 h1:FQPKKjDhzG0T4ew6dm6MGrXb4PRAi8ZmTuYuxcF62BM= github.com/biessek/golang-ico v0.0.0-20180326222316-d348d9ea4670/go.mod h1:iRWAFbKXMMkVQyxZ1PfGlkBr1TjATx1zy2MRprV7A3Q= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= @@ -90,7 +90,8 @@ golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86h golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9 h1:uc17S921SPw5F2gJo7slQ3aqvr2RwpL7eb3+DZncu3s= golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181021155630-eda9bb28ed51/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/main.go b/main.go index eebaf1e..6629ded 100644 --- a/main.go +++ b/main.go @@ -47,7 +47,7 @@ func main() { return } - var app = kingpin.New("app-builder", "app-builder").Version("3.4.1") + var app = kingpin.New("app-builder", "app-builder").Version("3.4.2") node_modules.ConfigureCommand(app) node_modules.ConfigureRebuildCommand(app) diff --git a/pkg/codesign/p12.go b/pkg/codesign/p12.go index 41c2b5f..da1233a 100644 --- a/pkg/codesign/p12.go +++ b/pkg/codesign/p12.go @@ -112,7 +112,7 @@ func readUsingOpenssl(inFile string, password string) ([]*x509.Certificate, erro return nil, err } - opensslPath = filepath.Join(vendor, "openssl", "openssl.exe") + opensslPath = filepath.Join(vendor, "openssl-ia32", "openssl.exe") } //noinspection SpellCheckingInspection diff --git a/pkg/download/tool.go b/pkg/download/tool.go index c6f8f71..94de3ae 100644 --- a/pkg/download/tool.go +++ b/pkg/download/tool.go @@ -54,7 +54,7 @@ func DownloadZstd(osName util.OsName) (string, error) { func DownloadWinCodeSign() (string, error) { //noinspection SpellCheckingInspection - return downloadFromGithub("winCodeSign", "2.4.1", "Kfw9mtrmdW+o31h7aoC4GgzZFTgvnuk1XMJJcD63rn0bXmVX8UjDQEuc8Kzb7iljDs5JlsmL4+T7Fo+cxDfErA==") + return downloadFromGithub("winCodeSign", "2.5.0", "xoTtj+PXTqTs47tkB/DyLKkXMFAclwRS3JNPOaZu7ZBnvs/gbY33ZSi+x2CH0xB83LAm+u6ixlhxtcMTl1Vrjg==") } func downloadFromGithub(name string, version string, checksum string) (string, error) {