Improve output formatting

bin/letsencrypt

@@ -199,7 +199,7 @@ foreach ($config['certificates'] as $certificate) {
     // issue new certificate
 
     if (Command::$result == 0) {
-        $climate->out('Certificate still valid for domains: ' . implode(', ', $domainNames) . '.');
+        $climate->info('Certificate still valid for domains: ' . implode(', ', $domainNames) . '.');
     }
     else {
         Command::exec('acme', [
@@ -226,7 +226,7 @@ foreach ($config['certificates'] as $certificate) {
 
         $notifications[] = 'Certificate issued for domains: ' . implode(', ', $domainNames) . '.';
 
-        $climate->out(end($notifications));
+        $climate->info(end($notifications));
     }
 
     // install certificate in cpanel for corresponding domains
@@ -273,13 +273,13 @@ foreach ($config['certificates'] as $certificate) {
     if ($installDomains) {
         $notifications[] = 'Certificate installed for domains: ' . implode(', ', $installDomains) . '.';
 
-        $climate->out(end($notifications));
+        $climate->info(end($notifications));
     }
 }
 
 if ($notifications) {
     notify('New certificates have been issued', implode(PHP_EOL, $notifications));
 }
 else {
-    $climate->out('No certificates were issued.');
+    $climate->info('No certificates were issued.');
 }

src/Command.php

@@ -134,14 +134,12 @@ public function __exec()
 
         // save and show command output together with error log
         static::$output = implode(PHP_EOL, $output) . (trim($error_log) ? $error_log : '');
+        static::$output = preg_replace('/^[\t ]+/', '', trim(static::$output));
 
-        // ensure that output ends with a newline
-        if (trim(static::$output) && ! preg_match('/(\n|\r\n)[\t ]*$/', static::$output)) {
-            static::$output .= PHP_EOL;
+        if (static::$output) {
+            echo static::$output . PHP_EOL;
         }
 
-        echo static::$output;
-
         // save and return last result code
         static::$result = $code;