From dbb42f90278c92d7dde0627a4647f8082dfa13d5 Mon Sep 17 00:00:00 2001
From: Anders Aaen Springborg <aaspringborg@gmail.com>
Date: Thu, 29 Apr 2021 12:23:13 +0200
Subject: [PATCH] [BUG] new.sh fix generator type , issue #9320 (#9321)

* generation type on  template dir path

* remove gen_type from template and resources
---
 new.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/new.sh b/new.sh
index 12cfec8cb579..7d33be840e55 100755
--- a/new.sh
+++ b/new.sh
@@ -178,7 +178,7 @@ public class ${lang_classname} extends DefaultCodegen implements CodegenConfig {
         outputFolder = "generated-code" + File.separator + "${gen_name_camel}";
         modelTemplateFiles.put("model.mustache", ".zz");
         apiTemplateFiles.put("api.mustache", ".zz");
-        embeddedTemplateDir = templateDir = "${gen_name_camel}-${gen_type}";
+        embeddedTemplateDir = templateDir = "${gen_name_camel}";
         apiPackage = "Apis";
         modelPackage = "Models";
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
@@ -191,17 +191,17 @@ EOF
 echo -e "\norg.openapitools.codegen.languages.${lang_classname}" >> "${root}/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig"
 
 # Step 3: Create resource files
-mkdir -p "${root}/modules/openapi-generator/src/main/resources/${gen_name_camel}-${gen_type}"
-echo "Creating modules/openapi-generator/src/main/resources/${gen_name_camel}-${gen_type}/README.mustache" && \
-    touch "${root}/modules/openapi-generator/src/main/resources/${gen_name_camel}-${gen_type}/README.mustache"
-echo "Creating modules/openapi-generator/src/main/resources/${gen_name_camel}-${gen_type}/model.mustache" && \
-    touch "${root}/modules/openapi-generator/src/main/resources/${gen_name_camel}-${gen_type}/model.mustache"
-echo "Creating modules/openapi-generator/src/main/resources/${gen_name_camel}-${gen_type}/api.mustache" && \
-    touch "${root}/modules/openapi-generator/src/main/resources/${gen_name_camel}-${gen_type}/api.mustache"
+mkdir -p "${root}/modules/openapi-generator/src/main/resources/${gen_name_camel}"
+echo "Creating modules/openapi-generator/src/main/resources/${gen_name_camel}/README.mustache" && \
+    touch "${root}/modules/openapi-generator/src/main/resources/${gen_name_camel}/README.mustache"
+echo "Creating modules/openapi-generator/src/main/resources/${gen_name_camel}/model.mustache" && \
+    touch "${root}/modules/openapi-generator/src/main/resources/${gen_name_camel}/model.mustache"
+echo "Creating modules/openapi-generator/src/main/resources/${gen_name_camel}/api.mustache" && \
+    touch "${root}/modules/openapi-generator/src/main/resources/${gen_name_camel}/api.mustache"
 
 # Step 4: Create generation config scripts
-echo "Creating bin/configs/${gen_name_camel}-${gen_type}-petstore-new.yaml"
-cat > "${root}/bin/configs/${gen_name_camel}-${gen_type}-petstore-new.yaml"<<EOF
+echo "Creating bin/configs/${gen_name_camel}-petstore-new.yaml"
+cat > "${root}/bin/configs/${gen_name_camel}-petstore-new.yaml"<<EOF
 generatorName: ${gen_name_camel}
 outputDir: samples/${gen_type}/petstore/${gen_name_camel_path}
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml