From efd0732a3e1c63143373949f2326c5b91f726b18 Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Tue, 24 Jan 2017 23:54:07 -0500 Subject: [PATCH] Fix the `rm` to remove the correct file in two spring generation bash scripts (#4630) Related #4439 --- bin/spring-delegate-j8.sh | 2 +- bin/spring-delegate.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/spring-delegate-j8.sh b/bin/spring-delegate-j8.sh index 1edb371ba49..5585caa6b8b 100755 --- a/bin/spring-delegate-j8.sh +++ b/bin/spring-delegate-j8.sh @@ -29,6 +29,6 @@ export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/ ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpring -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -o samples/server/petstore/springboot-delegate-j8 -DdelegatePattern=true,hideGenerationTimestamp=true,java8=true" echo "Removing files and folders under samples/server/petstore/springboot-delegate-j8/src/main" -rm -rf samples/server/petstore/springboot/src/main +rm -rf samples/server/petstore/springboot-delegate-j8/src/main find samples/server/petstore/springboot -maxdepth 1 -type f ! -name "README.md" -exec rm {} + java $JAVA_OPTS -jar $executable $ags diff --git a/bin/spring-delegate.sh b/bin/spring-delegate.sh index f63e617556c..1e523501cd9 100755 --- a/bin/spring-delegate.sh +++ b/bin/spring-delegate.sh @@ -29,6 +29,6 @@ export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/ ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpring -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -o samples/server/petstore/springboot-delegate -DdelegatePattern=true,hideGenerationTimestamp=true" echo "Removing files and folders under samples/server/petstore/springboot-delegate/src/main" -rm -rf samples/server/petstore/springboot/src/main +rm -rf samples/server/petstore/springboot-delegate/src/main find samples/server/petstore/springboot -maxdepth 1 -type f ! -name "README.md" -exec rm {} + java $JAVA_OPTS -jar $executable $ags