[BUGFIX] fix empty cache when user inside typo3conf/ext folder

t3kit · May 31, 2017 · 25b407a · 25b407a
1 parent d0f2ccf
commit 25b407a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 24 deletions.
diff --git a/index.js b/index.js
@@ -31,7 +31,6 @@ function generateSubtheme () {
   .then(() => prompt.isOk(cache, `Continue?`))
   .then(check.folder)
 
-  .then(prompt.subthemeQuestions)
   .then(prompt.siteName)
   .then(() => prompt.isOk(cache, text.subtheme.isAutoDirName(cache), prompt.dirName))
   .then(cmd.mkdir)
@@ -102,8 +101,9 @@ if (_.size(argv) !== 1 || argv._.length) {
   // t3kit  -s, --subtheme
   } else if (argv.s || argv.subtheme) {
     cache.whatToDo = 'subtheme'
-    console.log(chalk.red(text.notReady))
-    process.exit(1)
+    generateSubtheme()
+    // console.log(chalk.red(text.notReady))
+    // process.exit(1)
   } else {
     help.allHelp()
   }

diff --git a/lib/check/index.js b/lib/check/index.js
@@ -29,5 +29,7 @@ check.folder = function folder (cache) {
   // Check folder
   if (!helpers.pwd().endsWith('typo3conf/ext')) {
     return prompt.isOk(cache, text.subtheme.hint.dirName)
+  } else {
+    return cache
   }
 }
diff --git a/lib/prompt/index.js b/lib/prompt/index.js
@@ -147,27 +147,6 @@ prompt.templateVersion = function templateVersion (cache) {
   })
 }
 
-
-prompt.isOk = function isOk (cache, message) {
-  return new Promise(function (resolve, reject) {
-    let isOk = [
-      {
-        name: `isOk`,
-        type: 'confirm',
-        message: message
-      }
-    ]
-    inquirer.prompt(isOk)
-    .then(function (answers) {
-      if (answers.isOk) {
-        resolve(cache)
-      } else {
-        process.exit(1)
-      }
-    })
-  })
-}
-
 prompt.isOk = function isOk (cache, message, fn) {
   return new Promise(function (resolve, reject) {
     let isOk = [