mirror of
https://github.com/shivammathur/setup-php.git
synced 2026-08-06 08:12:09 -03:00
Improve Logs and tests
This commit is contained in:
@@ -25,17 +25,29 @@ const utils = __importStar(require("./utils"));
|
||||
* @param os_version
|
||||
* @param log_prefix
|
||||
*/
|
||||
function addExtension(extension_csv, version, os_version, log_prefix = 'Add Extension') {
|
||||
function addExtension(extension_csv, version, os_version, no_step = false) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
let script = '\n';
|
||||
switch (no_step) {
|
||||
case true:
|
||||
script +=
|
||||
(yield utils.stepLog('Setup Extensions', os_version)) +
|
||||
(yield utils.suppressOutput(os_version));
|
||||
break;
|
||||
case false:
|
||||
default:
|
||||
script += yield utils.stepLog('Setup Extensions', os_version);
|
||||
break;
|
||||
}
|
||||
switch (os_version) {
|
||||
case 'win32':
|
||||
return yield addExtensionWindows(extension_csv, version, log_prefix);
|
||||
return script + (yield addExtensionWindows(extension_csv, version));
|
||||
case 'darwin':
|
||||
return yield addExtensionDarwin(extension_csv, version, log_prefix);
|
||||
return script + (yield addExtensionDarwin(extension_csv, version));
|
||||
case 'linux':
|
||||
return yield addExtensionLinux(extension_csv, version, log_prefix);
|
||||
return script + (yield addExtensionLinux(extension_csv, version));
|
||||
default:
|
||||
return yield utils.log('Platform ' + os_version + ' is not supported', os_version, 'error', log_prefix);
|
||||
return yield utils.log('Platform ' + os_version + ' is not supported', os_version, 'error');
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -46,7 +58,7 @@ exports.addExtension = addExtension;
|
||||
* @param extension_csv
|
||||
* @param version
|
||||
*/
|
||||
function addExtensionDarwin(extension_csv, version, log_prefix) {
|
||||
function addExtensionDarwin(extension_csv, version) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
let extensions = yield utils.extensionArray(extension_csv);
|
||||
let script = '\n';
|
||||
@@ -72,15 +84,12 @@ function addExtensionDarwin(extension_csv, version, log_prefix) {
|
||||
break;
|
||||
}
|
||||
script +=
|
||||
'add_extension ' +
|
||||
'\nadd_extension ' +
|
||||
extension +
|
||||
' "' +
|
||||
install_command +
|
||||
'" ' +
|
||||
(yield utils.getExtensionPrefix(extension)) +
|
||||
' "' +
|
||||
log_prefix +
|
||||
'"\n';
|
||||
(yield utils.getExtensionPrefix(extension));
|
||||
});
|
||||
});
|
||||
return script;
|
||||
@@ -93,7 +102,7 @@ exports.addExtensionDarwin = addExtensionDarwin;
|
||||
* @param extension_csv
|
||||
* @param version
|
||||
*/
|
||||
function addExtensionWindows(extension_csv, version, log_prefix) {
|
||||
function addExtensionWindows(extension_csv, version) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
let extensions = yield utils.extensionArray(extension_csv);
|
||||
let script = '\n';
|
||||
@@ -117,15 +126,12 @@ function addExtensionWindows(extension_csv, version, log_prefix) {
|
||||
break;
|
||||
}
|
||||
script +=
|
||||
'Add-Extension ' +
|
||||
'\nAdd-Extension ' +
|
||||
extension +
|
||||
' "' +
|
||||
install_command +
|
||||
'" ' +
|
||||
(yield utils.getExtensionPrefix(extension)) +
|
||||
' "' +
|
||||
log_prefix +
|
||||
'"\n';
|
||||
(yield utils.getExtensionPrefix(extension));
|
||||
});
|
||||
});
|
||||
return script;
|
||||
@@ -138,7 +144,7 @@ exports.addExtensionWindows = addExtensionWindows;
|
||||
* @param extension_csv
|
||||
* @param version
|
||||
*/
|
||||
function addExtensionLinux(extension_csv, version, log_prefix) {
|
||||
function addExtensionLinux(extension_csv, version) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
let extensions = yield utils.extensionArray(extension_csv);
|
||||
let script = '\n';
|
||||
@@ -174,15 +180,12 @@ function addExtensionLinux(extension_csv, version, log_prefix) {
|
||||
break;
|
||||
}
|
||||
script +=
|
||||
'add_extension ' +
|
||||
'\nadd_extension ' +
|
||||
extension +
|
||||
' "' +
|
||||
install_command +
|
||||
'" ' +
|
||||
(yield utils.getExtensionPrefix(extension)) +
|
||||
' "' +
|
||||
log_prefix +
|
||||
'"\n';
|
||||
(yield utils.getExtensionPrefix(extension));
|
||||
});
|
||||
});
|
||||
return script;
|
||||
|
||||
Reference in New Issue
Block a user