@team-supercharge/oasg 13.2.0-feature-csharp-functions-953cbbf4.0 → 13.2.0-feature-csharp-functions-68ad1aa3.0

package/bin/exec.js

@@ -11,4 +11,15 @@ function exec(command, stdio) {
   }
 }
 
+function bash(command, stdio) {
+  try {
+    execSync(`bash -e -c "${command}"`, { stdio: stdio || 'inherit' });
+  }
+  catch (e) {
+    console.error(e.message);
+    exit(1);
+  }
+}
+
 exports.exec = exec;
+exports.bash = bash;

package/bin/oasg

@@ -15,6 +15,7 @@ const expressHttpProxy = require('express-http-proxy');
 const { exit } = require('process');
 
 const { exec } = require(`${__dirname}/exec.js`);
+const { bash } = require(`${__dirname}/exec.js`);
 const { merge } = require(`${__dirname}/merger.js`);
 const { applyOverrides } = require(`${__dirname}/overrider.js`);
 const { openApiTarget } = require(`${__dirname}/openapi-target.js`);
@@ -549,9 +550,9 @@ function fetchBinary(target) {
 
   // download binary
   console.log(`... downloading ${binary.url} ==> ${binaryPath}`);
-  exec(`bash -e -c "mkdir -p ${BIN_FOLDER}"`);
-  exec(`bash -e -c "wget ${binary.url} -q -O ${binaryPath}"`);
-  exec(`bash -e -c "chmod +x ${binaryPath}"`);
+  bash(`mkdir -p ${BIN_FOLDER}`);
+  bash(`wget ${binary.url} -q -O ${binaryPath}`);
+  bash(`chmod +x ${binaryPath}`);
   return binaryPath;
 }
 
@@ -582,9 +583,9 @@ function fetchFormatter(target) {
 
   // download binary
   console.log(`... downloading ${binary.url} ==> ${binaryPath}`);
-  exec(`bash -e -c "mkdir -p ${BIN_FOLDER}"`);
-  exec(`bash -e -c "wget ${binary.url} -q -O ${binaryPath}"`);
-  exec(`bash -e -c "chmod +x ${binaryPath}"`);
+  bash(`mkdir -p ${BIN_FOLDER}`);
+  bash(`wget ${binary.url} -q -O ${binaryPath}`);
+  bash(`chmod +x ${binaryPath}`);
   return binaryPath;
 }
 
@@ -595,12 +596,12 @@ function customizeTemplates(target) {
   const targetTemplateDir = `${__dirname}/../targets/${target.type}/templates`;
 
   if (fs.existsSync(templateDir)) {
-  exec(`bash -e -c "rm -rf ${templateDir}"`);
+  bash(`rm -rf ${templateDir}`);
   }
-  exec(`bash -e -c "mkdir -p ${templateDir}"`);
+  bash(`mkdir -p ${templateDir}`);
 
   if (fs.existsSync(targetTemplateDir)) {
-    exec(`bash -e -c "cp -R ${targetTemplateDir}/* ${templateDir}"`);
+    bash(`cp -R ${targetTemplateDir}/* ${templateDir}`);
   }
 
   if (target.templateDir) {
@@ -609,7 +610,7 @@ function customizeTemplates(target) {
       exit(1);
     }
 
-    exec(`bash -e -c "cp -R ${target.templateDir}/* ${templateDir}`);
+    bash(`cp -R ${target.templateDir}/* ${templateDir}`);
   }
 
   return templateDir;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "13.2.0-feature-csharp-functions-953cbbf4.0",
+  "version": "13.2.0-feature-csharp-functions-68ad1aa3.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