diff --git a/bin/commands/init/generate/.errors b/bin/commands/init/generate/.errors index 1e83c1d4d2..629ba9b6c1 100644 --- a/bin/commands/init/generate/.errors +++ b/bin/commands/init/generate/.errors @@ -1,3 +1,3 @@ ZWEL0143E|143|Cannot find data set member %s. You may need to re-run zwe install. ZWEL0157E|157|%s (%s) is not defined in Zowe YAML configuration file. -ZWEL0318E|318|Configuration stored in PARMLIB must use member name ZWEYAML when using generate action. +ZWEL0319E|319|Configuration stored in PARMLIB must use member name ZWEYAML when using generate action. diff --git a/bin/commands/init/generate/index.ts b/bin/commands/init/generate/index.ts index 7b15a61ce3..ef39f4245a 100644 --- a/bin/commands/init/generate/index.ts +++ b/bin/commands/init/generate/index.ts @@ -73,7 +73,7 @@ export function execute(dryRun?: boolean) { let endIndex = part.indexOf(')', memberIndex); let member = part.substring(memberIndex+1, endIndex); if (member.toUpperCase() != 'ZWEYAML') { - common.printErrorAndExit(`ZWEL0318E Configuration stored in PARMLIB must use member name ZWEYAML when using generate action.`, undefined, 318); + common.printErrorAndExit(`ZWEL0319E Configuration stored in PARMLIB must use member name ZWEYAML when using generate action.`, undefined, 319); } } configLines.push('PARMLIB ' + part.substring(0, part.indexOf('(')).replace(/[$]/g, '$$$$')); diff --git a/bin/commands/init/stc/index.ts b/bin/commands/init/stc/index.ts index 9619e362f3..f7ee31eb21 100644 --- a/bin/commands/init/stc/index.ts +++ b/bin/commands/init/stc/index.ts @@ -31,7 +31,7 @@ export function execute(allowOverwrite: boolean = false) { // constants const COMMAND_LIST = std.getenv('ZWE_CLI_COMMANDS_LIST'); - let stcExistence: boolean; + let stcExistence: boolean; // validation common.requireZoweYaml(); @@ -68,13 +68,12 @@ export function execute(allowOverwrite: boolean = false) { [security_stcs_zowe, security_stcs_zis, security_stcsAux].forEach((mb: string) => { // STCs in target proclib - stcExistence=zosdataset.isDatasetExists(`${proclib}(${mb})`); - if (stcExistence == true) { + if (zosdataset.isDatasetExists(`${proclib}(${mb})`)) { + stcExistence = true; if (allowOverwrite) { // warning common.printMessage(`Warning ZWEL0300W: ${proclib}(${mb}) already exists. This data set member will be overwritten during configuration.`); } else { - // common.printErrorAndExit(`Error ZWEL0158E: ${proclib}(${mb}) already exists.`, undefined, 158); // warning common.printMessage(`Warning ZWEL0301W: ${proclib}(${mb}) already exists and will not be overwritten. For upgrades, you must use --allow-overwrite.`); }