aliyun-oss-deploy
Advanced tools
Comparing version 0.1.2 to 0.1.3
@@ -29,3 +29,3 @@ #!/usr/bin/env node | ||
.option('c', { | ||
describe: 'Set your .aliossrc file path', | ||
describe: 'Set your .aliossrc file path or JSON string', | ||
type: 'string', | ||
@@ -46,7 +46,13 @@ alias: 'aliossrc', | ||
// oss 配置文件 | ||
const aliossrc = argv.aliossrc && path.resolve(argv.aliossrc) || path.join(process.cwd(), '.aliossrc'); | ||
const aliossrc = argv.aliossrc ? path.resolve(argv.aliossrc) : path.join(process.cwd(), '.aliossrc'); | ||
const ossConfig = JSON.parse(fs.readFileSync(aliossrc, { | ||
encoding: 'utf8', | ||
})); | ||
let ossConfig; | ||
// 文件存在则直接读取 | ||
if (fs.existsSync(aliossrc)) { | ||
ossConfig = JSON.parse(fs.readFileSync(aliossrc, { | ||
encoding: 'utf8', | ||
})); | ||
} else { | ||
ossConfig = JSON.parse(argv.aliossrc); | ||
} | ||
@@ -53,0 +59,0 @@ // 校验配置 |
{ | ||
"name": "aliyun-oss-deploy", | ||
"version": "0.1.2", | ||
"version": "0.1.3", | ||
"description": "An aliyun oss deploy tool, putObject and putStream are all supported.", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -8,3 +8,3 @@ # aliyun-oss-deploy | ||
![image](https://user-images.githubusercontent.com/7856674/39998106-a1fba014-57b7-11e8-8c15-3dc662bd5a10.png) | ||
![image](https://user-images.githubusercontent.com/7856674/40217123-aa5df822-5a9d-11e8-8b2d-5488967e3fcc.png) | ||
@@ -11,0 +11,0 @@ ## Install |
Sorry, the diff of this file is not supported yet
49281
213