Merge pull request #87 from ByteInternet/allow_no_ssh_key

Author: tdgroot

src/Deployer/Task/Common/PrepareSshTaskGlobal.php

@@ -4,9 +4,9 @@
 
 namespace Hypernode\Deploy\Deployer\Task\Common;
 
+use Deployer\Exception\RunException;
 use Hypernode\Deploy\Deployer\Task\TaskBase;
 use Hypernode\DeployConfiguration\Configuration;
-use Symfony\Component\Process\Exception\ProcessFailedException;
 
 use function Deployer\get;
 use function Deployer\runLocally;
@@ -31,16 +31,19 @@ public function configure(Configuration $config): void
         task('prepare:ssh', function () {
             $this->configureKey();
 
-            if (testLocally('ssh-add -l | grep -q "no identities"')) {
+            $agentHasNoIdentities = testLocally('ssh-add -l | grep -q "no identities"');
+            $sshKeyFileExists = testLocally('[ -f {{ssh_key_file}} ]');
+
+            if ($agentHasNoIdentities && $sshKeyFileExists) {
                 try {
                     runLocally('ssh-add -k {{ssh_key_file}}');
-                } catch (ProcessFailedException $e) {
+                } catch (RunException $e) {
                     writeln('Failed to add key to ssh agent.');
                     writeln('Trying key {{ssh_key_file}}');
                     try {
                         $keyMd5 = runLocally('md5sum {{ssh_key_file}}');
                         writeln("With MD5 $keyMd5");
-                    } catch (ProcessFailedException $e) {
+                    } catch (RunException $e) {
                         writeln('Failed to get keyfile MD5 ' . $e);
                     }
                     throw $e;