Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 67152eb

Browse files
shivammathurshivammathur
committed
Accept PECL default parameters
1 parent 83bdf15 commit 67152eb

File tree

5 files changed

+30
-19
lines changed

5 files changed

+30
-19
lines changed

‎__tests__/extensions.test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ describe('Extension tests', () => {
136136
expect(darwin).toContain('add_brew_extension grpc');
137137
expect(darwin).toContain('add_brew_extension protobuf');
138138
expect(darwin).toContain('add_brew_extension swoole');
139-
expect(darwin).toContain('sudo pecl install -f sqlite3');
139+
expect(darwin).toContain('pecl_install sqlite3');
140140
expect(darwin).toContain('remove_extension intl');
141141
expect(darwin).toContain('add_unstable_extension ast beta extension');
142142
expect(darwin).toContain('add_pecl_extension grpc 1.2.3 extension');
@@ -163,13 +163,13 @@ describe('Extension tests', () => {
163163
expect(darwin).toContain('add_brew_extension pcov');
164164

165165
darwin = await extensions.addExtension('xdebug', '5.3', 'darwin');
166-
expect(darwin).toContain('sudo pecl install -f xdebug-2.2.7');
166+
expect(darwin).toContain('pecl_install xdebug-2.2.7');
167167

168168
darwin = await extensions.addExtension('xdebug', '5.4', 'darwin');
169-
expect(darwin).toContain('sudo pecl install -f xdebug-2.4.1');
169+
expect(darwin).toContain('pecl_install xdebug-2.4.1');
170170

171171
darwin = await extensions.addExtension('xdebug', '5.5', 'darwin');
172-
expect(darwin).toContain('sudo pecl install -f xdebug-2.5.5');
172+
expect(darwin).toContain('pecl_install xdebug-2.5.5');
173173

174174
darwin = await extensions.addExtension('xdebug', '5.6', 'darwin');
175175
expect(darwin).toContain('add_brew_extension xdebug');
@@ -181,18 +181,18 @@ describe('Extension tests', () => {
181181
expect(darwin).toContain('add_brew_extension xdebug');
182182

183183
darwin = await extensions.addExtension('redis', '5.6', 'darwin');
184-
expect(darwin).toContain('sudo pecl install -f redis-2.2.8');
184+
expect(darwin).toContain('pecl_install redis-2.2.8');
185185

186186
darwin = await extensions.addExtension('redis', '7.2', 'darwin');
187-
expect(darwin).toContain('sudo pecl install -f redis');
187+
expect(darwin).toContain('pecl_install redis');
188188

189189
darwin = await extensions.addExtension('imagick', '5.6', 'darwin');
190190
expect(darwin).toContain('brew install pkg-config imagemagick');
191-
expect(darwin).toContain('sudo pecl install -f imagick');
191+
expect(darwin).toContain('pecl_install imagick');
192192

193193
darwin = await extensions.addExtension('imagick', '7.4', 'darwin');
194194
expect(darwin).toContain('brew install pkg-config imagemagick');
195-
expect(darwin).toContain('sudo pecl install -f imagick');
195+
expect(darwin).toContain('pecl_install imagick');
196196

197197
darwin = await extensions.addExtension('blackfire', '7.3', 'darwin');
198198
expect(darwin).toContain('blackfire_darwin.sh 7.3 blackfire');

‎dist/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3629,7 +3629,7 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
36293629
const version_extension = version + extension;
36303630
const [ext_name, ext_version] = extension.split('-');
36313631
const ext_prefix = await utils.getExtensionPrefix(ext_name);
3632-
const command_prefix = 'sudo pecl install -f ';
3632+
const command_prefix = 'pecl_install ';
36333633
let command = '';
36343634
switch (true) {
36353635
// match :extension

‎src/extensions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export async function addExtensionDarwin(
2020
const version_extension: string = version + extension;
2121
const [ext_name, ext_version]: string[] = extension.split('-');
2222
const ext_prefix = await utils.getExtensionPrefix(ext_name);
23-
const command_prefix = 'sudo pecl install -f ';
23+
const command_prefix = 'pecl_install ';
2424
let command = '';
2525
switch (true) {
2626
// match :extension

‎src/scripts/darwin.sh‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@ get_pecl_version() {
7070
echo "$pecl_version"
7171
}
7272

73+
# Function to install PECL extensions and accept default options
74+
pecl_install() {
75+
local extension=$1
76+
yes '' | sudo pecl install -f "$extension" >/dev/null 2>&1
77+
}
78+
7379
# Function to install a specific version of PECL extension.
7480
add_pecl_extension() {
7581
extension=$1
@@ -87,7 +93,7 @@ add_pecl_extension() {
8793
else
8894
remove_extension "$extension" >/dev/null 2>&1
8995
(
90-
sudo pecl install -f "$extension-$pecl_version" >/dev/null 2>&1 &&
96+
pecl_install "$extension-$pecl_version" &&
9197
check_extension "$extension" &&
9298
add_log "$tick" "$extension" "Installed and enabled"
9399
) || add_log "$cross" "$extension" "Could not install $extension-$pecl_version on PHP $semver"
@@ -161,12 +167,12 @@ add_tool() {
161167
if [ "$tool" = "composer" ]; then
162168
configure_composer "$tool_path"
163169
elif [ "$tool" = "phan" ]; then
164-
add_extension fileinfo "sudo pecl install -f fileinfo" extension >/dev/null 2>&1
165-
add_extension ast "sudo pecl install -f ast" extension >/dev/null 2>&1
170+
add_extension fileinfo "pecl_install fileinfo" extension >/dev/null 2>&1
171+
add_extension ast "pecl_install ast" extension >/dev/null 2>&1
166172
elif [ "$tool" = "phive" ]; then
167-
add_extension curl "sudo pecl install -f curl" extension >/dev/null 2>&1
168-
add_extension mbstring "sudo pecl install -f mbstring" extension >/dev/null 2>&1
169-
add_extension xml "sudo pecl install -f xml" extension >/dev/null 2>&1
173+
add_extension curl "pecl_install curl" extension >/dev/null 2>&1
174+
add_extension mbstring "pecl_install mbstring" extension >/dev/null 2>&1
175+
add_extension xml "pecl_install xml" extension >/dev/null 2>&1
170176
elif [ "$tool" = "cs2pr" ]; then
171177
sudo sed -i '' 's/exit(9)/exit(0)/' "$tool_path"
172178
tr -d '\r' <"$tool_path" | sudo tee "$tool_path.tmp" >/dev/null 2>&1 && sudo mv "$tool_path.tmp" "$tool_path"

‎src/scripts/linux.sh‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,12 @@ get_pecl_version() {
9191
echo "$pecl_version"
9292
}
9393

94+
# Function to install PECL extensions and accept default options
95+
pecl_install() {
96+
local extension=$1
97+
yes '' | sudo pecl install -f "$extension" >/dev/null 2>&1
98+
}
99+
94100
# Function to check if an extension is loaded.
95101
check_extension() {
96102
extension=$1
@@ -167,8 +173,7 @@ add_extension() {
167173
install_command="update_lists && ${install_command/5\.[4-5]-$extension/5-$extension=$release_version}"
168174
fi
169175
eval "$install_command" >/dev/null 2>&1 ||
170-
(update_lists && eval "$install_command" >/dev/null 2>&1) ||
171-
sudo pecl install -f "$extension" >/dev/null 2>&1
176+
(update_lists && eval "$install_command" >/dev/null 2>&1) || pecl_install "$extension"
172177
(check_extension "$extension" && add_log "$tick" "$extension" "Installed and enabled") ||
173178
add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
174179
fi
@@ -192,7 +197,7 @@ add_pecl_extension() {
192197
else
193198
delete_extension "$extension"
194199
(
195-
sudo pecl install -f "$extension-$pecl_version" >/dev/null 2>&1 &&
200+
pecl_install "$extension-$pecl_version" &&
196201
check_extension "$extension" &&
197202
add_log "$tick" "$extension" "Installed and enabled"
198203
) || add_log "$cross" "$extension" "Could not install $extension-$pecl_version on PHP $semver"

0 commit comments

Comments
 (0)