@team-supercharge/oasg 13.2.0-feature-csharp-functions-36681406.0 → 13.2.0-feature-csharp-functions-100d975c.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "13.2.0-feature-csharp-functions-36681406.0",
+  "version": "13.2.0-feature-csharp-functions-100d975c.0",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",

package/targets/common.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # command line arguments:
 #   1. version - semantic version string
 #   2. binary - openapi-generator JAR file
@@ -21,10 +23,12 @@ templateDir=$9
 
 echo -e "\n=====\n  version:\t$version\n  binary:\t$binary\n  configFile:\t$configFile\n  targetId:\t$targetId\n generatorId:\t$generatorId\n openApiFile:\t$openApiFile\n  formatter:\t$formatterBinary\n  preRelease:\t$preRelease\n templateDir:\t$templateDir\n ---"
 
-for paramName in $(cat $configFile | jq -r ".targets[] | select(.id==\"$targetId\") | del(.id) | del(.type) | del(.source) | del(.generator) | del(.generatorId) | del(.templateDir) | keys | .[]"); do
-  result=$(cat $configFile | jq -r ".targets[] | select(.id==\"$targetId\") | .$paramName")
-  echo -e "  $paramName:\t$result"
-  eval $paramName="'$result'"
+target=$(jq -r --arg targetId "$targetId" '.targets[] | select(.id==$targetId) | del(.id, .type, .source, .generator, .generatorId, .templateDir)' "$configFile")
+
+for paramName in $(echo "$target" | jq -r 'keys | .[]'); do
+    result=$(echo "$target" | jq -r --arg paramName "$paramName" '.[$paramName]')
+    echo -e "  $paramName:\t$result"
+    eval $paramName="'$result'"
 done
 
 echo -e "=====\n"