1
0
mirror of https://github.com/JuanCanham/HackMyResume.git synced 2024-11-22 08:20:11 +00:00

Merge pull request #19 from fluentdesk/rel/v0.9.1

Rel/v0.9.1
This commit is contained in:
JD 2015-11-24 10:52:20 -05:00
commit d2791014ef
2 changed files with 6 additions and 4 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "fluentcv", "name": "fluentcv",
"version": "0.9.0", "version": "0.9.1",
"description": "Generate beautiful, targeted resumes from your command line, shell, or in Javascript with Node.js.", "description": "Generate beautiful, targeted resumes from your command line, shell, or in Javascript with Node.js.",
"repository": { "repository": {
"type": "git", "type": "git",
@ -34,7 +34,7 @@
"dependencies": { "dependencies": {
"FRESCA": "fluentdesk/FRESCA#v0.1.0", "FRESCA": "fluentdesk/FRESCA#v0.1.0",
"colors": "^1.1.2", "colors": "^1.1.2",
"fluent-themes": "0.5.0-beta", "fluent-themes": "0.5.1-beta",
"fs-extra": "^0.24.0", "fs-extra": "^0.24.0",
"html": "0.0.10", "html": "0.0.10",
"is-my-json-valid": "^2.12.2", "is-my-json-valid": "^2.12.2",

View File

@ -14,7 +14,6 @@ var FS = require( 'fs' )
// Default options. // Default options.
var _defaultOpts = { var _defaultOpts = {
themeRelative: '../../node_modules/fluent-themes/themes',
keepBreaks: true, keepBreaks: true,
freezeBreaks: true, freezeBreaks: true,
nSym: '&newl;', // newline entity nSym: '&newl;', // newline entity
@ -76,7 +75,10 @@ var TemplateGenerator = module.exports = BaseGenerator.extend({
this.opts = EXTEND( true, { }, _defaultOpts, opts ); this.opts = EXTEND( true, { }, _defaultOpts, opts );
// Verify the specified theme name/path // Verify the specified theme name/path
var tFolder = PATH.resolve( __dirname, this.opts.themeRelative, this.opts.theme ); var tFolder = PATH.join(
PATH.parse( require.resolve('fluent-themes') ).dir,
this.opts.theme
);
var exists = require('../utils/file-exists'); var exists = require('../utils/file-exists');
if (!exists( tFolder )) { if (!exists( tFolder )) {
tFolder = PATH.resolve( this.opts.theme ); tFolder = PATH.resolve( this.opts.theme );