Skip to content

Commit dccdb5a

Browse files
committed
Fix loading PECL extensions
1 parent 9a01fd2 commit dccdb5a

File tree

2 files changed

+29
-8
lines changed

2 files changed

+29
-8
lines changed

dist/index.js

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -354,13 +354,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
354354
step((generator = generator.apply(thisArg, _arguments || [])).next());
355355
});
356356
};
357+
var __importStar = (this && this.__importStar) || function (mod) {
358+
if (mod && mod.__esModule) return mod;
359+
var result = {};
360+
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
361+
result["default"] = mod;
362+
return result;
363+
};
357364
Object.defineProperty(exports, "__esModule", { value: true });
358-
const os = __webpack_require__(87);
359-
const events = __webpack_require__(614);
360-
const child = __webpack_require__(129);
361-
const path = __webpack_require__(622);
362-
const io = __webpack_require__(1);
363-
const ioUtil = __webpack_require__(672);
365+
const os = __importStar(__webpack_require__(87));
366+
const events = __importStar(__webpack_require__(614));
367+
const child = __importStar(__webpack_require__(129));
368+
const path = __importStar(__webpack_require__(622));
369+
const io = __importStar(__webpack_require__(1));
370+
const ioUtil = __importStar(__webpack_require__(672));
364371
/* eslint-disable @typescript-eslint/unbound-method */
365372
const IS_WINDOWS = process.platform === 'win32';
366373
/*
@@ -804,6 +811,12 @@ class ToolRunner extends events.EventEmitter {
804811
resolve(exitCode);
805812
}
806813
});
814+
if (this.options.input) {
815+
if (!cp.stdin) {
816+
throw new Error('child process missing stdin');
817+
}
818+
cp.stdin.end(this.options.input);
819+
}
807820
});
808821
});
809822
}
@@ -2870,8 +2883,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
28702883
step((generator = generator.apply(thisArg, _arguments || [])).next());
28712884
});
28722885
};
2886+
var __importStar = (this && this.__importStar) || function (mod) {
2887+
if (mod && mod.__esModule) return mod;
2888+
var result = {};
2889+
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
2890+
result["default"] = mod;
2891+
return result;
2892+
};
28732893
Object.defineProperty(exports, "__esModule", { value: true });
2874-
const tr = __webpack_require__(9);
2894+
const tr = __importStar(__webpack_require__(9));
28752895
/**
28762896
* Exec a command.
28772897
* Output will be streamed to the live console.

src/scripts/linux.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ update_ppa() {
2727
# Function to configure PECL
2828
configure_pecl() {
2929
if [ "$pecl_config" = "false" ] && [ -e /usr/bin/pecl ]; then
30+
sudo touch "$scan_dir"/99-pecl.ini >/dev/null 2>&1
3031
for tool in pear pecl; do
31-
sudo "$tool" config-set php_ini "$ini_file" >/dev/null 2>&1
32+
sudo "$tool" config-set php_ini "$scan_dir"/99-pecl.ini >/dev/null 2>&1
3233
sudo "$tool" config-set auto_discover 1 >/dev/null 2>&1
3334
sudo "$tool" channel-update "$tool".php.net >/dev/null 2>&1
3435
done

0 commit comments

Comments
 (0)