Merge branch 'fix-domainlib-capture' into 'release/4.2'

rjeberhard · rjeberhard · commit 59d149beafca · 2024-11-20T14:38:30.000Z
Fix domain library capture logic

See merge request weblogic-cloud/weblogic-kubernetes-operator!4873
diff --git a/operator/src/main/resources/scripts/modelInImage.sh b/operator/src/main/resources/scripts/modelInImage.sh
@@ -1102,7 +1102,7 @@ wdtUpdateModelDomain() {
 captureBinLibAdded() {
   local BINLIBDIR_NAME="/tmp/binlibdir.txt"
   find $DOMAIN_HOME/bin -maxdepth 1 -type f | sed  "s|$DOMAIN_HOME/bin|wlsdeploy/domainBin|g" > $BINLIBDIR_NAME
-  find $DOMAIN_HOME/lib -maxdepth 1 -type f | sed  "s|$DOMAIN_HOME/bin|wlsdeploy/domainLibraries|g" >> $BINLIBDIR_NAME
+  find $DOMAIN_HOME/lib -maxdepth 1 -type f | sed  "s|$DOMAIN_HOME/lib|wlsdeploy/domainLibraries|g" >> $BINLIBDIR_NAME
 }
 
 wdtHandleOnlineUpdate() {

Original file line number	Diff line number	Diff line change
`@@ -1102,7 +1102,7 @@ wdtUpdateModelDomain() {`
`1102`	`1102`	`captureBinLibAdded() {`
`1103`	`1103`	`local BINLIBDIR_NAME="/tmp/binlibdir.txt"`
`1104`	`1104`	`find $DOMAIN_HOME/bin -maxdepth 1 -type f \| sed "s\|$DOMAIN_HOME/bin\|wlsdeploy/domainBin\|g" > $BINLIBDIR_NAME`
`1105`		`- find $DOMAIN_HOME/lib -maxdepth 1 -type f \| sed "s\|$DOMAIN_HOME/bin\|wlsdeploy/domainLibraries\|g" >> $BINLIBDIR_NAME`
	`1105`	`+ find $DOMAIN_HOME/lib -maxdepth 1 -type f \| sed "s\|$DOMAIN_HOME/lib\|wlsdeploy/domainLibraries\|g" >> $BINLIBDIR_NAME`
`1106`	`1106`	`}`
`1107`	`1107`
`1108`	`1108`	`wdtHandleOnlineUpdate() {`