diff --git a/CHANGELOG.md b/CHANGELOG.md index 50dfcaf..872af63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Change Log This change log is started in 0.0.9; +## 0.1.0 (2016-05-12) +- Save basel.json data in package.json +- Release + ## 0.0.17 (2016-04-29) - Adapt to accept other themes diff --git a/bin/basel-init.js b/bin/basel-init.js index 90dd143..2eedd90 100644 --- a/bin/basel-init.js +++ b/bin/basel-init.js @@ -16,7 +16,6 @@ program var options = { name: program.args.length ? program.args[0] : 'basel', - branch: program.branch || 'master', database: program.database || 'database', title: program.title, type: program.type || 'simple', diff --git a/lib/install.js b/lib/install.js index e7b1df4..27257fd 100644 --- a/lib/install.js +++ b/lib/install.js @@ -71,5 +71,14 @@ var renameRemote = function(options, done){ } var createJson = function(options){ - fs.writeFileSync(path.join(process.cwd(),options.name,'basel.json') , JSON.stringify(options)); + fs.readFile(path.join(process.cwd(),options.name,'package.json'), function(err, data){ + data = JSON.parse(data); + if(!err){ + for(var key in options){ + data[key] = options[key]; + } + fs.writeFileSync(path.join(process.cwd(),options.name,'package.json') , JSON.stringify(data, null, 4)); + } + }) + fs.writeFileSync(path.join(process.cwd(),options.name,'basel.json') , JSON.stringify(options, null, 4)); } \ No newline at end of file diff --git a/package.json b/package.json index 338c96c..ae29afd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "basel", - "version": "0.0.17", + "version": "0.1.0", "description": "Framework for Bootstrap, AngularJS, SQLite, Electron", "author": "Jayr Alencar ", "readmeFilename": "README.md" ,