diff --git a/lib/extensions.js b/lib/extensions.js index c3c16c01..422d6898 100644 --- a/lib/extensions.js +++ b/lib/extensions.js @@ -171,7 +171,7 @@ function addExtensionLinux(extension_csv, version) { 'sudo DEBIAN_FRONTEND=noninteractive apt-get install -y php' + version + '-' + - extension + + extension.replace('pdo_', '').replace('pdo-', '') + ' >/dev/null 2>&1 || sudo pecl install ' + extension + ' >/dev/null 2>&1'; diff --git a/lib/utils.js b/lib/utils.js index 57a7e55f..dc066d10 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -110,9 +110,7 @@ function extensionArray(extension_csv) { return extension .trim() .replace('php-', '') - .replace('php_', '') - .replace('pdo_', '') - .replace('pdo-', ''); + .replace('php_', ''); }); } }); diff --git a/package-lock.json b/package-lock.json index 8e950eff..a6d043b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1744,7 +1744,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -2159,7 +2160,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -2215,6 +2217,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -2258,12 +2261,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, diff --git a/src/extensions.ts b/src/extensions.ts index ee7be62b..43942a2b 100644 --- a/src/extensions.ts +++ b/src/extensions.ts @@ -164,7 +164,7 @@ export async function addExtensionLinux( 'sudo DEBIAN_FRONTEND=noninteractive apt-get install -y php' + version + '-' + - extension + + extension.replace('pdo_', '').replace('pdo-', '') + ' >/dev/null 2>&1 || sudo pecl install ' + extension + ' >/dev/null 2>&1'; diff --git a/src/utils.ts b/src/utils.ts index e73d8111..5342e44f 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -112,9 +112,7 @@ export async function extensionArray( return extension .trim() .replace('php-', '') - .replace('php_', '') - .replace('pdo_', '') - .replace('pdo-', ''); + .replace('php_', ''); }); } }