Skip to content

Fix #12 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NoahDragon merged 2 commits into from
May 22, 2017
Merged

Fix #12 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37c6e6a
fix: #12 init destroys `.git`
leesei Apr 18, 2016
0a7c7f9
add comment, `exit()` should return Promise
leesei Apr 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions lib/console/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use strict';

var Promise = require('bluebird');
var pathFn = require('path');
var chalk = require('chalk');
var fs = require('hexo-fs');
Expand All @@ -21,6 +22,12 @@ function initConsole(args) {
var log = this.log;
var promise;

if (fs.existsSync(target) && fs.readdirSync(target).length !== 0) {
log.fatal(chalk.magenta(tildify(target)) +
' not empty, please run `hexo init` on an empty folder and then copy your files into it');
return Promise.reject(new Error('target not empty'));
}

log.info('Cloning hexo-starter to', chalk.magenta(tildify(target)));

if (args.clone) {
Expand Down
5 changes: 5 additions & 0 deletions lib/context.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ var EventEmitter = require('events').EventEmitter;
var Promise = require('bluebird');
var ConsoleExtend = require('./extend/console');

// a stub Hexo object
// see `hexojs/hexo/lib/hexo/index.js`

function Context(base, args) {
base = base || process.cwd();
args = args || {};
Expand Down Expand Up @@ -53,6 +56,8 @@ Context.prototype.exit = function(err) {
chalk.underline('http://hexo.io/docs/troubleshooting.html')
);
}

return Promise.resolve();
};

Context.prototype.unwatch = function() {
Expand Down