HPCC-23772 Fix setupPKI issue with #_ in compname and file ownership

Signed-off-by: Michael Gardner <[email protected]>
amy88ma · Jun 16, 2020 · 901fb7b · 901fb7b
1 parent 5b80483
commit 901fb7b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/initfiles/bash/etc/init.d/setupPKI.in b/initfiles/bash/etc/init.d/setupPKI.in
@@ -38,7 +38,7 @@ envfile="${CONFIG_DIR}/${ENV_XML_FILE}"
 
 OIFS=$IFS
 IFS=$'\n'
-compArray=($(${sbin_path}/configgen -env ${envfile} -listall | awk 'BEGIN { FS=",";} {print $2;}'))
+compArray=($(${sbin_path}/configgen -env ${envfile} -listall | awk 'BEGIN { FS=",";} {print $2;}' | sort | uniq))
 IFS=$OIFS
 
 if [ ${#compArray[@]} -eq 0 ]; then
@@ -73,7 +73,7 @@ fi
 for i in "" ${compArray[@]} ; do
     compName=""
     if [ "$i" != "" ]; then
-        compName=""${i#*_}
+        compName=""${i}
     fi
     if [ "${compName}" != "" ]; then
          compNamePrint=${compName}
@@ -124,4 +124,6 @@ else
     log_success_msg
 fi
 
+chown -R ${USER_NAME}:${USER_NAME} ${homePath}
+
 exit 0