Merge pull request #567 from oracle/cshi-fix-del-sh

rjeberhard · web-flow · commit b5d58469a880 · 2018-12-05T16:45:35.000-05:00
Fixing "internal/utility.sh: No such file or directory"
diff --git a/kubernetes/samples/scripts/delete-weblogic-domain-resources.sh b/kubernetes/samples/scripts/delete-weblogic-domain-resources.sh
@@ -14,14 +14,13 @@
 
 script="${BASH_SOURCE[0]}"
 scriptDir="$( cd "$( dirname "${script}" )" && pwd )"
-source ${scriptDir}/internal/utility.sh
+source ${scriptDir}/../../internal/utility.sh
 
 function usage {
 cat << EOF
   Usage:
 
     $(basename $0) -d domain-uid,domain-uid,... [-s max-seconds] [-t]
-    $(basename $0) -d all [-s max-seconds] [-t]
     $(basename $0) -h
 
   Perform a best-effort delete of the kubernetes resources for
@@ -62,7 +61,6 @@ EOF
 #
 # Usage:
 #   getDomainResources domainA,domainB,... outfilename
-#   getDomainResources all outfilename
 #
 # Internal helper function
 #

Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,13 @@`
`14`	`14`
`15`	`15`	`script="${BASH_SOURCE[0]}"`
`16`	`16`	`scriptDir="$( cd "$( dirname "${script}" )" && pwd )"`
`17`		`-source ${scriptDir}/internal/utility.sh`
	`17`	`+source ${scriptDir}/../../internal/utility.sh`
`18`	`18`
`19`	`19`	`function usage {`
`20`	`20`	`cat << EOF`
`21`	`21`	`Usage:`
`22`	`22`
`23`	`23`	`$(basename $0) -d domain-uid,domain-uid,... [-s max-seconds] [-t]`
`24`		`- $(basename $0) -d all [-s max-seconds] [-t]`
`25`	`24`	`$(basename $0) -h`
`26`	`25`
`27`	`26`	`Perform a best-effort delete of the kubernetes resources for`
`@@ -62,7 +61,6 @@ EOF`
`62`	`61`	`#`
`63`	`62`	`# Usage:`
`64`	`63`	`# getDomainResources domainA,domainB,... outfilename`
`65`		`-# getDomainResources all outfilename`
`66`	`64`	`#`
`67`	`65`	`# Internal helper function`
`68`	`66`	`#`