Merge branch '6316-hide-stderr-from-which-1-on-centos' into 'develop'

Till Brehm · Till Brehm · commit d743c378e0f9 · 2022-09-26T07:44:12.000Z
Resolve "hide stderr from which(1) on centos"

Closes #6316

See merge request ispconfig/ispconfig3!1635
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -52,7 +52,7 @@ private function install_acme() {
 	}
 
 	public function update_acme() {
-		$acme = explode("\n", shell_exec('which acme.sh /usr/local/ispconfig/server/scripts/acme.sh /root/.acme.sh/acme.sh'));
+		$acme = explode("\n", shell_exec('which acme.sh /usr/local/ispconfig/server/scripts/acme.sh /root/.acme.sh/acme.sh 2> /dev/null'));
 		$acme = reset($acme);
 		$val = 0;
 
diff --git a/server/lib/classes/letsencrypt.inc.php b/server/lib/classes/letsencrypt.inc.php
@@ -44,7 +44,7 @@ public function __construct(){
 	}
 
 	public function get_acme_script() {
-		$acme = explode("\n", shell_exec('which acme.sh /usr/local/ispconfig/server/scripts/acme.sh /root/.acme.sh/acme.sh'));
+		$acme = explode("\n", shell_exec('which acme.sh /usr/local/ispconfig/server/scripts/acme.sh /root/.acme.sh/acme.sh 2> /dev/null'));
 		$acme = reset($acme);
 		if(is_executable($acme)) {
 			return $acme;

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ private function install_acme() {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public function update_acme() {`
`55`		`- $acme = explode("\n", shell_exec('which acme.sh /usr/local/ispconfig/server/scripts/acme.sh /root/.acme.sh/acme.sh'));`
	`55`	`+ $acme = explode("\n", shell_exec('which acme.sh /usr/local/ispconfig/server/scripts/acme.sh /root/.acme.sh/acme.sh 2> /dev/null'));`
`56`	`56`	`$acme = reset($acme);`
`57`	`57`	`$val = 0;`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct(){`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public function get_acme_script() {`
`47`		`- $acme = explode("\n", shell_exec('which acme.sh /usr/local/ispconfig/server/scripts/acme.sh /root/.acme.sh/acme.sh'));`
	`47`	`+ $acme = explode("\n", shell_exec('which acme.sh /usr/local/ispconfig/server/scripts/acme.sh /root/.acme.sh/acme.sh 2> /dev/null'));`
`48`	`48`	`$acme = reset($acme);`
`49`	`49`	`if(is_executable($acme)) {`
`50`	`50`	`return $acme;`