Merge pull request #6 from auroral-ui/beta

fix: package version reading path for themes folder

index.js

@@ -1,22 +1,22 @@
-const chalk = require('chalk');
 const appRoot = require('app-root-path');
-const { throwError, throwInfo } = require('./lib/helpers/utils');
+const chalk = require('chalk');
 const pluginPack = require('./package.json');
+const { throwInfo, throwError } = require('./lib/helpers/utils');
 require('./lib/filters')(hexo);
 require('./lib/generators')(hexo);
 require('./lib/injector')(hexo);
 
-var pack;
+var themePack;
 
 try {
-  pack = require(appRoot + '/node_modules/hexo-theme-aurora/package.json');
+  themePack = require(appRoot + '/node_modules/hexo-theme-aurora/package.json');
 } catch (error) {
   throwInfo(
     'Aurora Plugin',
     `Aurora Plugin fail to get current Aurora Theme version from package location, trying to get from themes folder instead...`
   );
   try {
-    pack = require(appRoot + '/themes/hexo-theme-aurora/package.json');
+    themePack = require(appRoot + '/themes/aurora/package.json');
   } catch (error) {
     throwError(
       'Aurora Plugin Error',
@@ -43,7 +43,7 @@ hexo.on('exit', function () {
       chalk.magenta(' v' + pluginPack.version) +
       ' & ' +
       chalk.cyan.bold('hexo-theme-aurora') +
-      chalk.magenta(' v' + pack.version)
+      chalk.magenta(' v' + themePack.version)
   );
   console.log(chalk.green('INFO  ') + 'Crafted by ' + chalk.cyan.bold('bennyxguo <三钻>'));
 });

lib/generators/site.js

@@ -1,19 +1,20 @@
 const appRoot = require('app-root-path');
 const { throwInfo, throwError } = require('../helpers/utils');
-var pack;
+
+var themePack;
 
 try {
-  pack = require(appRoot + '/node_modules/hexo-theme-aurora/package.json');
+  themePack = require(appRoot + '/node_modules/hexo-theme-aurora/package.json');
 } catch (error) {
   throwInfo(
-    'Aurora Site Generator',
+    'Aurora Plugin',
     `Aurora Plugin fail to get current Aurora Theme version from package location, trying to get from themes folder instead...`
   );
   try {
-    pack = require(appRoot + '/themes/hexo-theme-aurora/package.json');
+    themePack = require(appRoot + '/themes/aurora/package.json');
   } catch (error) {
     throwError(
-      'Aurora Site Generator Error',
+      'Aurora Plugin Error',
       `Aurora Plugin fail to get current Aurora Theme version, please make sure you have the theme installed.`
     );
     return;
@@ -24,7 +25,7 @@ class SiteGenerator {
   data = {};
 
   constructor(configs) {
-    configs.theme_config.version = pack.version;
+    configs.theme_config.version = themePack.version;
     this.data = configs;
   }
 

lib/helpers/utils.js

@@ -136,7 +136,7 @@ exports.throwError = function (type, msg) {
   console.error(
     `${chalk.red('[ERROR]')} ${chalk.yellow(
       `Please create an issue @ https://github.com/auroral-ui/hexo-plugin-aurora/issues with the above error message. Thanks!
-请在 @ https://github.com/auroral-ui/hexo-plugin-aurora/issues 提交一个 issue, 并附带以上报错信息, 谢谢！`
+请在 @https://github.com/auroral-ui/hexo-plugin-aurora/issues 提交一个 issue, 并附带以上报错信息, 谢谢！`
     )}`
   );
 };