From dccdb5ab679ff41ff0c6ffddfd383b1bc23cb9eb Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Tue, 5 May 2020 13:57:42 +0530 Subject: [PATCH] Fix loading PECL extensions --- dist/index.js | 34 +++++++++++++++++++++++++++------- src/scripts/linux.sh | 3 ++- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dist/index.js b/dist/index.js index 7ce31cb5..d76268c8 100644 --- a/dist/index.js +++ b/dist/index.js @@ -354,13 +354,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; + result["default"] = mod; + return result; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const os = __webpack_require__(87); -const events = __webpack_require__(614); -const child = __webpack_require__(129); -const path = __webpack_require__(622); -const io = __webpack_require__(1); -const ioUtil = __webpack_require__(672); +const os = __importStar(__webpack_require__(87)); +const events = __importStar(__webpack_require__(614)); +const child = __importStar(__webpack_require__(129)); +const path = __importStar(__webpack_require__(622)); +const io = __importStar(__webpack_require__(1)); +const ioUtil = __importStar(__webpack_require__(672)); /* eslint-disable @typescript-eslint/unbound-method */ const IS_WINDOWS = process.platform === 'win32'; /* @@ -804,6 +811,12 @@ class ToolRunner extends events.EventEmitter { resolve(exitCode); } }); + if (this.options.input) { + if (!cp.stdin) { + throw new Error('child process missing stdin'); + } + cp.stdin.end(this.options.input); + } }); }); } @@ -2870,8 +2883,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; + result["default"] = mod; + return result; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const tr = __webpack_require__(9); +const tr = __importStar(__webpack_require__(9)); /** * Exec a command. * Output will be streamed to the live console. diff --git a/src/scripts/linux.sh b/src/scripts/linux.sh index 667bf79d..214ae429 100644 --- a/src/scripts/linux.sh +++ b/src/scripts/linux.sh @@ -27,8 +27,9 @@ update_ppa() { # Function to configure PECL configure_pecl() { if [ "$pecl_config" = "false" ] && [ -e /usr/bin/pecl ]; then + sudo touch "$scan_dir"/99-pecl.ini >/dev/null 2>&1 for tool in pear pecl; do - sudo "$tool" config-set php_ini "$ini_file" >/dev/null 2>&1 + sudo "$tool" config-set php_ini "$scan_dir"/99-pecl.ini >/dev/null 2>&1 sudo "$tool" config-set auto_discover 1 >/dev/null 2>&1 sudo "$tool" channel-update "$tool".php.net >/dev/null 2>&1 done