Fixes after testing

Signed-off-by: 1000TurquoisePogs <[email protected]>
zowe · Jan 31, 2024 · 109b3d9 · 109b3d9
1 parent f4bdf39
commit 109b3d9
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/bin/commands/init/generate/index.sh b/bin/commands/init/generate/index.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+#######################################################################
+# This program and the accompanying materials are made available
+# under the terms of the Eclipse Public License v2.0 which
+# accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-v20.html
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Copyright Contributors to the Zowe Project.
+#######################################################################
+
+USE_CONFIGMGR=$(check_configmgr_enabled)
+if [ "${USE_CONFIGMGR}" = "true" ]; then
+  if [ -z "${ZWE_PRIVATE_TMP_MERGED_YAML_DIR}" ]; then
+    # user-facing command, use tmpdir to not mess up workspace permissions
+    export ZWE_PRIVATE_TMP_MERGED_YAML_DIR=1
+  fi
+  _CEE_RUNOPTS="XPLINK(ON),HEAPPOOLS(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/init/generate/cli.js"
+else
+  echo "This command is only available when zowe.useConfigmgr=true"
+fi
diff --git a/bin/commands/init/generate/index.ts b/bin/commands/init/generate/index.ts
@@ -25,8 +25,7 @@ export function execute(dryRun?: boolean) {
   zosFs.copyMvsToUss(ZOWE_CONFIG.zowe.setup.dataset.prefix + '.SZWESAMP(ZWEGENER)', tempFile);
   let jclContents = xplatform.loadFileUTF8(tempFile, xplatform.AUTO_DETECT);
 
-  jclContents = jclContents.replace("DSN={zowe.setup.dataset.prefix}", "DSN="+ZOWE_CONFIG.zowe.setup.dataset.prefix);
-  jclContents = jclContents.replace("{zowe.setup.dataset.loadlib}", ZOWE_CONFIG.zowe.setup.dataset.loadlib);
+  jclContents = jclContents.replace(/\{zowe\.setup\.dataset\.prefix\}/gi, ZOWE_CONFIG.zowe.setup.dataset.prefix);
   jclContents = jclContents.replace(/\{zowe\.runtimeDirectory\}/gi, ZOWE_CONFIG.zowe.runtimeDirectory);
   jclContents = jclContents.replace('FILE <full path to zowe.yaml file>', 'FILE '+ZOWE_CONFIG.zowe.workspaceDirectory+'/.env/.zowe-merged.yaml');
 

diff --git a/bin/commands/init/mvs/index.sh b/bin/commands/init/mvs/index.sh
@@ -17,7 +17,7 @@ print_level1_message "Initialize Zowe custom data sets"
 cust_ds_list="parmlib|Zowe parameter library
 jcllib|Zowe JCL library
 authLoadlib|Zowe authorized load library
-authPluginLib|Zowe authorized plugin library
+authPluginLib|Zowe authorized plugin library"
 
 ###############################
 # validation

diff --git a/files/SZWESAMP/ZWEIMVS b/files/SZWESAMP/ZWEIMVS
@@ -43,7 +43,7 @@ blksize(32760) unit(sysallda) space(30,15) tracks
 //MCOPY1 EXEC PGM=IEBCOPY                         
 //SYSPRINT DD SYSOUT=A                            
 //SYSUT1 DD DSN={zowe.setup.dataset.prefix}.SZWESAMP,DISP=SHR  
-//SYSUT2 DD DSN={zowe.setup.dataset.jcllib},DISP=OLD
+//SYSUT2 DD DSN={zowe.setup.dataset.parmlib},DISP=OLD
 //SYSIN DD *                                      
   COPY OUTDD=SYSUT2,INDD=SYSUT1                                  
   SELECT MEMBER=(ZWESIP00)