Merge pull request #145 from shivammathur/develop

shivammathur · web-flow · commit 2ee4653d1c96 · 2020-01-10T07:10:05.000+05:30
Improve remove_extensions in linux
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "dist/index.js",
diff --git a/src/scripts/linux.sh b/src/scripts/linux.sh
@@ -47,7 +47,8 @@ remove_extension() {
     sudo phpdismod -v "$version" "$extension"
   fi
   sudo sed -i "/$extension/d" "$ini_file"
-  sudo DEBIAN_FRONTEND=noninteractive apt-get remove php-"$extension" -y >/dev/null 2>&1
+  sudo rm -rf /etc/php/"$version"/cli/conf.d/*"$extension"* >/dev/null 2>&1
+  sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
 }
 
 # Function to setup a remote tool

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "setup-php",`
`3`		`- "version": "1.7.1",`
	`3`	`+ "version": "1.7.2",`
`4`	`4`	`"private": false,`
`5`	`5`	`"description": "Setup PHP for use with GitHub Actions",`
`6`	`6`	`"main": "dist/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ remove_extension() {`
`47`	`47`	`sudo phpdismod -v "$version" "$extension"`
`48`	`48`	`fi`
`49`	`49`	`sudo sed -i "/$extension/d" "$ini_file"`
`50`		`- sudo DEBIAN_FRONTEND=noninteractive apt-get remove php-"$extension" -y >/dev/null 2>&1`
	`50`	`+ sudo rm -rf /etc/php/"$version"/cli/conf.d/"$extension" >/dev/null 2>&1`
	`51`	`+ sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`# Function to setup a remote tool`