Skip to content

Commit 8fd97ed

Browse files
committed
fix issue with files not being over written
1 parent 79deacc commit 8fd97ed

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

src/GenerateTemplateFiles.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,7 @@ export default class GenerateTemplateFiles {
7474
const contentReplacers: IReplacer[] = this._getReplacers(replacers, contentCase);
7575
const outputPathReplacers: IReplacer[] = this._getReplacers(replacers, outputPathCase);
7676
const outputPath: string = await this._getOutputPath(outputPathReplacers, selectedConfigItem);
77-
let shouldWriteFiles: boolean = selectedConfigItem.output.overwrite || yargs.argv.overwrite === true;
78-
79-
if (!this._isCommandLine) {
80-
shouldWriteFiles = selectedConfigItem.output.overwrite || (await this._shouldWriteFiles(outputPath));
81-
}
77+
const shouldWriteFiles: boolean = await this._shouldWriteFiles(outputPath, selectedConfigItem);
8278

8379
if (shouldWriteFiles === false) {
8480
console.info('No new files created');
@@ -219,13 +215,21 @@ export default class GenerateTemplateFiles {
219215

220216
/**
221217
*/
222-
private async _shouldWriteFiles(outputPath: string): Promise<boolean> {
218+
private async _shouldWriteFiles(outputPath: string, selectedConfigItem: IConfigItem): Promise<boolean> {
223219
const doesPathExist: boolean = await pathExists(outputPath);
224220

225-
if (doesPathExist === false) {
221+
if (!doesPathExist) {
222+
return true;
223+
}
224+
225+
if (!this._isCommandLine && selectedConfigItem.output.overwrite) {
226226
return true;
227227
}
228228

229+
if (this._isCommandLine) {
230+
return selectedConfigItem.output.overwrite || yargs.argv.overwrite === true;
231+
}
232+
229233
const overwriteFilesAnswer: any = await enquirer.prompt({
230234
name: 'overwrite',
231235
message: 'Overwrite files, continue?',

0 commit comments

Comments
 (0)