Merge pull request #13691 from stevekuznetsov/skuznets/find

OpenShift Bot · web-flow · commit 585b160e5ce3 · 2017-04-09T18:02:11.000-05:00
Merged by openshift-bot
diff --git a/hack/lib/cleanup.sh b/hack/lib/cleanup.sh
@@ -118,7 +118,7 @@ function os::cleanup::tmpdir() {
 	fi
 
 	# delete any sub directory underneath BASETMPDIR
-	for directory in $( find "${BASETMPDIR}" -d 2 ); do
+	for directory in $( find "${BASETMPDIR}" -mindepth 2 -maxdepth 2 ); do
 		${USE_SUDO:+sudo} rm -rf "${directory}"
 	done
 }

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ function os::cleanup::tmpdir() {`
`118`	`118`	`fi`
`119`	`119`
`120`	`120`	`# delete any sub directory underneath BASETMPDIR`
`121`		`- for directory in $( find "${BASETMPDIR}" -d 2 ); do`
	`121`	`+ for directory in $( find "${BASETMPDIR}" -mindepth 2 -maxdepth 2 ); do`
`122`	`122`	`${USE_SUDO:+sudo} rm -rf "${directory}"`
`123`	`123`	`done`
`124`	`124`	`}`