Skip to content

Commit

Permalink
docs: clarify tool CLI flags electron-userland#1224
Browse files Browse the repository at this point in the history
  • Loading branch information
develar committed Feb 17, 2017
1 parent 8344fdd commit e531017
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
2 changes: 2 additions & 0 deletions docs/Publishing Artifacts.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Currently, [GitHub Releases](https://help.github.com/articles/about-releases/),
To use Amazon S3 please install `electron-publisher-s3` dependency.

## CLI Flags

Excerpt from [CLI Usage](https://github.com/electron-userland/electron-builder#cli-usage) of `build` command:
```
Publishing:
--publish, -p [choices: "onTag", "onTagOrDraft", "always", "never"]
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"7zip-bin": "^2.0.4",
"archiver": "^1.3.0",
"asar-electron-builder": "^0.13.5",
"aws-sdk": "^2.15.0",
"aws-sdk": "^2.16.0",
"bluebird-lst": "^1.0.1",
"chalk": "^1.1.3",
"chromium-pickle-js": "^0.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/electron-builder-http/src/httpExecutor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export class HttpExecutorHolder {
export const executorHolder = new HttpExecutorHolder()

export function download(url: string, destination: string, options?: DownloadOptions | null): Promise<string> {
return executorHolder.httpExecutor.download(url, destination, options)
return executorHolder.httpExecutor.download(url, destination, options || {cancellationToken: new CancellationToken()})
}

export class HttpError extends Error {
Expand Down Expand Up @@ -79,7 +79,7 @@ export abstract class HttpExecutor<REQUEST_OPTS, REQUEST> {

protected abstract doApiRequest<T>(options: REQUEST_OPTS, cancellationToken: CancellationToken, requestProcessor: (request: REQUEST, reject: (error: Error) => void) => void, redirectCount: number): Promise<T>

abstract download(url: string, destination: string, options?: DownloadOptions | null): Promise<string>
abstract download(url: string, destination: string, options: DownloadOptions): Promise<string>

protected handleResponse(response: Response, options: RequestOptions, cancellationToken: CancellationToken, resolve: (data?: any) => void, reject: (error: Error) => void, redirectCount: number, requestProcessor: (request: REQUEST, reject: (error: Error) => void) => void) {
if (this.debug.enabled) {
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-publisher-s3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
],
"dependencies": {
"fs-extra-p": "^4.0.1",
"aws-sdk": "^2.15.0",
"aws-sdk": "^2.16.0",
"mime": "^1.3.4",
"electron-publish": "~0.0.0-semantic-release",
"electron-builder-util": "~0.0.0-semantic-release"
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,9 @@ asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"

aws-sdk@^2.15.0:
version "2.15.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.15.0.tgz#dca391a793210d4b062b5f1f5d6bb25bc4d4ba5c"
aws-sdk@^2.16.0:
version "2.16.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.16.0.tgz#c3bf4cac031b5af0db2a0f03e75f59a70ace8ff4"
dependencies:
buffer "4.9.1"
crypto-browserify "1.0.9"
Expand Down Expand Up @@ -2690,8 +2690,8 @@ redeyed@~1.0.0:
esprima "~3.0.0"

regenerator-runtime@^0.10.0:
version "0.10.1"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz#257f41961ce44558b18f7814af48c17559f9faeb"
version "0.10.2"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.2.tgz#d8180f73493b2f216f6b7282ce1d943372c2c56f"

regex-cache@^0.4.2:
version "0.4.3"
Expand Down

0 comments on commit e531017

Please sign in to comment.