3 files changed, 16 insertions, 5 deletions
diff --git a/src/main/java/org/sonarsource/scanner/cli/Conf.java b/src/main/java/org/sonarsource/scanner/cli/Conf.java
index b914516..e6a84a8 100644
--- a/src/main/java/org/sonarsource/scanner/cli/Conf.java
+++ b/src/main/java/org/sonarsource/scanner/cli/Conf.java
@@ -28,6 +28,7 @@ import java.nio.file.Paths;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 import javax.annotation.Nullable;
@@ -42,6 +43,7 @@ class Conf {
   private static final String PROPERTY_PROJECT_BASEDIR = "sonar.projectBaseDir";
   private static final String PROPERTY_PROJECT_CONFIG_FILE = "sonar.projectConfigFile";
   private static final String SONAR_PROJECT_PROPERTIES_FILENAME = "sonar-project.properties";
+  private static final String PROPERTY_SONAR_HOST_URL = "sonar.host.url";
 
   private final Cli cli;
   private final Logs logger;
@@ -68,6 +70,15 @@ class Conf {
     return result;
   }
 
+  boolean isSonarCloud(@Nullable Properties testProperties) {
+    String hostUrl = testProperties != null ? testProperties.getProperty(PROPERTY_SONAR_HOST_URL) : properties().getProperty(PROPERTY_SONAR_HOST_URL);
+    if (hostUrl != null) {
+      return hostUrl.toLowerCase(Locale.getDefault()).contains("sonarcloud");
+    }
+
+    return false;
+  }
+
   private Properties resolve(Properties props) {
     PropertyResolver resolver = new PropertyResolver(props, env);
     return resolver.resolve();
diff --git a/src/main/java/org/sonarsource/scanner/cli/Main.java b/src/main/java/org/sonarsource/scanner/cli/Main.java
index 5764423..229a9d2 100644
--- a/src/main/java/org/sonarsource/scanner/cli/Main.java
+++ b/src/main/java/org/sonarsource/scanner/cli/Main.java
@@ -71,12 +71,12 @@ public class Main {
       configureLogging(p);
       init(p);
       runner.start();
-      logger.info("SonarQube server " + runner.serverVersion());
+      logger.info(String.format("Analyzing on %s", conf.isSonarCloud(null) ? "SonarCloud" : ("SonarQube server " + runner.serverVersion())));
       execute(stats, p);
       status = Exit.SUCCESS;
     } catch (Throwable e) {
       displayExecutionResult(stats, "FAILURE");
-      showError("Error during SonarQube Scanner execution", e, cli.isDebugEnabled());
+      showError("Error during SonarScanner execution", e, cli.isDebugEnabled());
       status = isUserError(e) ? Exit.USER_ERROR : Exit.INTERNAL_ERROR;
     } finally {
       exit.exit(status);
@@ -86,7 +86,7 @@ public class Main {
 
   private void checkSkip(Properties properties) {
     if ("true".equalsIgnoreCase(properties.getProperty(ScanProperties.SKIP))) {
-      logger.info("SonarQube Scanner analysis skipped");
+      logger.info("SonarScanner analysis skipped");
       exit.exit(Exit.SUCCESS);
     }
   }
@@ -149,7 +149,7 @@ public class Main {
 
   private void suggestDebugMode() {
     if (!cli.isEmbedded()) {
-      logger.error("Re-run SonarQube Scanner using the -X switch to enable full debug logging.");
+      logger.error("Re-run SonarScanner using the -X switch to enable full debug logging.");
     }
   }
 
diff --git a/src/main/java/org/sonarsource/scanner/cli/SystemInfo.java b/src/main/java/org/sonarsource/scanner/cli/SystemInfo.java
index 2ee3468..09ad1f5 100644
--- a/src/main/java/org/sonarsource/scanner/cli/SystemInfo.java
+++ b/src/main/java/org/sonarsource/scanner/cli/SystemInfo.java
@@ -30,7 +30,7 @@ class SystemInfo {
   }
 
   static void print(Logs logger) {
-    logger.info("SonarQube Scanner " + ScannerVersion.version());
+    logger.info("SonarScanner " + ScannerVersion.version());
     logger.info(java());
     logger.info(os());
     String scannerOpts = system.getenv("SONAR_SCANNER_OPTS");