Set version using a sync process

Dexus · Apr 4, 2023 · 6b27908 · 6b27908
1 parent 3f7cbce
commit 6b27908
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/lib/openssl.js b/lib/openssl.js
@@ -1,6 +1,7 @@
 var helper = require('./helper.js')
 var {debug} = require('./debug.js')
 var cpspawn = require('child_process').spawn
+var spawnSync = require('child_process').spawnSync
 var pathlib = require('path')
 var fs = require('fs')
 var osTmpdir = require('os-tmpdir')
@@ -261,8 +262,10 @@ function testOpenSSLPath(pathBin, callback) {
 }
 
 /* Once PEM is imported, the openSslVersion is set with this function. */
-spawn(['version'], false, function (err, code, stdout, stderr) {
-  var text = String(stdout) + '\n' + String(stderr) + '\n' + String(err)
+function setVersion() {
+  var pathBin = get('pathOpenSSL') || process.env.OPENSSL_BIN || 'openssl'
+  var output = spawnSync(pathBin, ['version'])
+  var text = String(output.stdout) + '\n' + String(output.stderr) + '\n' + String(output.error)
   let version = versionRegEx.exec(text)
   if (version === null || version.length <= 7) return
   set('openSslVersion', (version[1]).toUpperCase())
@@ -273,7 +276,9 @@ spawn(['version'], false, function (err, code, stdout, stderr) {
   set('VendorVersionMinor', version[5])
   set('VendorVersionPatch', version[6])
   set('VendorVersionBuildChar', typeof version[7] === 'undefined' ? '' : version[7])
-})
+};
+
+setVersion();
 
 module.exports = {
   exec: exec,