From ec6e90acd3c1fd271e3a264e1fe4eaf6083888a1 Mon Sep 17 00:00:00 2001
From: kurita0 <4556927+kurita0@users.noreply.github.com>
Date: Thu, 9 Jun 2022 06:05:15 +0900
Subject: [PATCH] fix getting wp core version string via ssh (#1344)

* fix getting wp core version string via ssh

* check DocRoot
---
 scanner/base.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scanner/base.go b/scanner/base.go
index d37a75fe..96cc7366 100644
--- a/scanner/base.go
+++ b/scanner/base.go
@@ -747,9 +747,10 @@ func (l *base) scanWordPress() error {
 		return nil
 	}
 	l.log.Info("Scanning WordPress...")
-	cmd := fmt.Sprintf("sudo -u %s -i -- %s cli version --allow-root",
+	cmd := fmt.Sprintf("sudo -u %s -i -- %s core version --path=%s --allow-root",
 		l.ServerInfo.WordPress.OSUser,
-		l.ServerInfo.WordPress.CmdPath)
+		l.ServerInfo.WordPress.CmdPath,
+		l.ServerInfo.WordPress.DocRoot)
 	if r := exec(l.ServerInfo, cmd, noSudo); !r.isSuccess() {
 		return xerrors.Errorf("Failed to exec `%s`. Check the OS user, command path of wp-cli, DocRoot and permission: %#v", cmd, l.ServerInfo.WordPress)
 	}
@@ -791,7 +792,7 @@ func (l *base) detectWordPress() (*models.WordPressPackages, error) {
 }
 
 func (l *base) detectWpCore() (string, error) {
-	cmd := fmt.Sprintf("sudo -u %s -i -- %s core version --path=%s --allow-root",
+	cmd := fmt.Sprintf("sudo -u %s -i -- %s core version --path=%s --allow-root 2>/dev/null",
 		l.ServerInfo.WordPress.OSUser,
 		l.ServerInfo.WordPress.CmdPath,
 		l.ServerInfo.WordPress.DocRoot)