Skip to content

Commit

Permalink
Merge pull request #38 from rishiqing/patch-0114-05
Browse files Browse the repository at this point in the history
log--debug remoteCopy
  • Loading branch information
wgm7512 authored Jan 14, 2020
2 parents 9f93b3b + 7db15e7 commit 0ee5a03
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 11 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tingkelai-electron",
"version": "1.0.4",
"version": "1.0.5",
"description": "听客来PC客户端",
"main": "main.js",
"author": "南京听客来信息技术有限公司",
Expand Down
29 changes: 19 additions & 10 deletions remoteCopy.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ const path = require('path');

const sourceList = [
// { type: 'mac', key: 'pc-autoupdate/mac/check/release-mac.json' },
{ type: 'ia32', key: 'pc-autoupdate/win/ia32/check/release.json' },
{ type: 'x64', key: 'pc-autoupdate/win/x64/check/release.json' }
// { type: 'ia32', key: 'pc-autoupdate/win/ia32/check/release.json' },
// { type: 'x64', key: 'pc-autoupdate/win/x64/check/release.json' },
{ type: 'ia32', key: 'pc-autoupdate/win/ia32/beta/beta.json' },
{ type: 'x64', key: 'pc-autoupdate/win/x64/beta/beta.json' },
];

const copySource = {
Expand All @@ -28,17 +30,24 @@ const copySource = {
ia32: {
prefix: 'pc-autoupdate/win/ia32',
list: [
`tingkelai-win-ia32-release-${pkg.version}.exe`,
`release.json`,
`release.yml`,
// `tingkelai-win-ia32-release-${pkg.version}.exe`,
// `release.json`,
// `release.yml`,

`tingkelai-win-ia32-beta-${pkg.version}.exe`,
`beta.json`,
`beta.yml`,
]
},
x64: {
prefix: 'pc-autoupdate/win/x64',
list: [
`tingkelai-win-x64-release-${pkg.version}.exe`,
`release.json`,
`release.yml`,
// `tingkelai-win-x64-release-${pkg.version}.exe`,
// `release.json`,
// `release.yml`,
`tingkelai-win-x64-beta-${pkg.version}.exe`,
`beta.json`,
`beta.yml`,
]
}
};
Expand Down Expand Up @@ -107,7 +116,7 @@ const deal = async function () {
const result = path.parse(file);
const base = result.name + '_' + (new Date()).getTime() + result.ext
await copyObject({
CopySource: path.join('/tingkelai-client', copyDetail.prefix, 'release', file).replace(/\\/g, '/'),
CopySource: path.join('/tingkelai-client', copyDetail.prefix, 'beta', file).replace(/\\/g, '/'),
Key: path.join(copyDetail.prefix, 'test', base).replace(/\\/g, '/') // 这个地方不能以 '/' 开头,不然会报签名错误
});
}
Expand All @@ -118,7 +127,7 @@ const deal = async function () {
* tingkelai-mac-beta-1.0.1.dmg
*/
await copyObject({
CopySource: path.join('/tingkelai-client', copyDetail.prefix, 'release', file).replace(/\\/g, '/'),
CopySource: path.join('/tingkelai-client', copyDetail.prefix, 'beta', file).replace(/\\/g, '/'),
Key: path.join(copyDetail.prefix, 'test', file).replace(/\\/g, '/')
});
}
Expand Down

0 comments on commit 0ee5a03

Please sign in to comment.