diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-04-07 12:22:26 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-04-07 12:22:26 +0000 |
| commit | d50fca7dd40f596ebb8b50cd9c4140857f2a0637 (patch) | |
| tree | a8b40991dcab905c34658c3d860ad7e0a4554c9d /build/vnu-jar.js | |
| parent | Releasing debian version 1.10.3+dfsg-1. (diff) | |
| download | bootstrap-icons-d50fca7dd40f596ebb8b50cd9c4140857f2a0637.tar.xz bootstrap-icons-d50fca7dd40f596ebb8b50cd9c4140857f2a0637.zip | |
Merging upstream version 1.10.4+dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | build/vnu-jar.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/build/vnu-jar.js b/build/vnu-jar.js index 6885015..c87d518 100644 --- a/build/vnu-jar.js +++ b/build/vnu-jar.js @@ -2,22 +2,24 @@ /*! * Script to run vnu-jar if Java is available. - * Copyright 2017-2022 The Bootstrap Authors - * Copyright 2017-2022 Twitter, Inc. + * Copyright 2017-2023 The Bootstrap Authors * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ 'use strict' -const { execFile, spawn } = require('child_process') +const { execFile, spawn } = require('node:child_process') const vnu = require('vnu-jar') execFile('java', ['-version'], (error, stdout, stderr) => { if (error) { - console.error('Skipping vnu-jar test; Java is missing.') + console.error('Skipping vnu-jar test; Java is probably missing.') + console.error(error) return } + console.log('Running vnu-jar validation...') + const is32bitJava = !/64-Bit/.test(stderr) // vnu-jar accepts multiple ignores joined with a `|`. @@ -40,6 +42,8 @@ execFile('java', ['-version'], (error, stdout, stderr) => { args.splice(0, 0, '-Xss512k') } + console.log(`command used: java ${args.join(' ')}`) + return spawn('java', args, { shell: true, stdio: 'inherit' |