1.0.6

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 1.0.6 - 2021-09-24
 - Exclude `resourcepaths` table from db backup
 - Ignore mysql import errors 🤞🏻
+- Better error output
 
 ## 1.0.5 - 2021-05-12
 - Update craft-auto-migrate to use `project-config/apply`

src/Exceptions/CraftNotInstalledException.php

@@ -6,4 +6,8 @@
 
 class CraftNotInstalledException extends RemoteException
 {
+    /**
+     * @var string
+     */
+    public $message = 'Craft is not installed on the fortrabbit App.';
 }

src/Services/Ssh.php

@@ -125,24 +125,25 @@ public function exec(string $cmd)
             return true;
         }
 
-        if (trim($process->getErrorOutput()) === 'Could not open input file') {
-            throw new CraftNotInstalledException(
-                trim($process->getErrorOutput())
-            );
-        }
+        $out = $process->getOutput();
+        $err = $process->getOutput();
 
-        if (stristr($process->getErrorOutput(), 'Unknown command')) {
-            throw new PluginNotInstalledException(
-                'The Craft Copy plugin is not installed on remote.'
-            );
+        if (stristr($out, 'Could not open input file')) {
+            throw new CraftNotInstalledException();
+        }
+        if (stristr($err, 'Could not open input file')) {
+            throw new CraftNotInstalledException();
+        }
+        if (stristr($err, 'Unknown command')) {
+            throw new PluginNotInstalledException();
         }
 
         throw new RemoteException(
             implode(PHP_EOL, [
                 'SSH Remote error: ' . $process->getExitCode(),
                 'Command: ' . $process->getCommandLine(),
                 'Output:',
-                $process->getErrorOutput(),
+                $err,
             ])
         );
     }