修复sync命名Bug

ZhaZhengRefn · Feb 16, 2018 · 0a730a5 · 0a730a5
1 parent c70619e
commit 0a730a5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/bin/pharah b/bin/pharah
@@ -3,7 +3,7 @@
 const program = require('commander')
 const path = require('path')
 
-const req = command => path.resolve('./commands/', command)
+const req = command => path.resolve(__dirname, '../commands/', command)
 
 program
     .version(require('../package.json').version, '-v, --version')

diff --git a/commands/sync.js b/commands/sync.js
@@ -34,9 +34,8 @@ module.exports = inquirer.prompt([
     }
 ])
 .then(({ url, mode }) => {
-    download(url, path.resolve(__dirname, '../'), { encoding: 'utf8' })
+    download(url, { encoding: 'utf8' })
     .then(data => {
-
         try {
             data = JSON.parse(data)
         } catch (error) {
@@ -46,8 +45,11 @@ module.exports = inquirer.prompt([
         if(mode === 'merge'){
             templateList = Object.assign(templateList, data)
         } else if(mode === 'replace'){
-            templateList = data
+            templateList = Object.assign({}, data)
         }
         writeTemplateList(templateList, path.resolve(__dirname, '../template.json'))
     })
+    .catch(e => {
+        console.log(e)
+    })
 })
diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "pharah-cli",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "description": "A cli that aims to managing template code.",
   "main": "index.js",
   "bin": {
-    "pharah": "./bin/pharah"
+    "pharah": "bin/pharah"
   },
   "scripts": {},
   "repository": {