fix ssh cmd

Signed-off-by: Dave Grantham <dwg@linuxprogrammer.org>
cryptidtech · Apr 28, 2024 · c38e28b · c38e28b
1 parent 0e4da28
commit c38e28b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/action.yml b/action.yml
@@ -16,6 +16,9 @@ inputs:
     ssh-add-cmd:
         description: 'ssh-add command'
         required: false
+    ssh-cmd:
+        description: 'ssh command'
+        required: false
     git-cmd:
         description: 'git command'
         required: false

diff --git a/dist/cleanup.js b/dist/cleanup.js
@@ -2684,13 +2684,14 @@ module.exports = (process.env['OS'] != 'Windows_NT') ? {
     homePath: os.userInfo().homedir,
     sshAgentCmdDefault: 'ssh-agent',
     sshAddCmdDefault: 'ssh-add',
-    sshCmd: 'ssh',
+    sshCmdDefault: 'ssh',
     gitCmdDefault: 'git'
 } : {
     // Assuming GitHub hosted `windows-*` runners for now
     homePath: os.homedir(),
     sshAgentCmdDefault: 'c://progra~1//git//usr//bin//ssh-agent.exe',
     sshAddCmdDefault: 'c://progra~1//git//usr//bin//ssh-add.exe',
+    sshCmd: 'c://progra~1//git//usr//bin//ssh.exe',
     gitCmdDefault: 'c://progra~1//git//bin//git.exe'
 };
 

diff --git a/dist/index.js b/dist/index.js
@@ -2684,13 +2684,14 @@ module.exports = (process.env['OS'] != 'Windows_NT') ? {
     homePath: os.userInfo().homedir,
     sshAgentCmdDefault: 'ssh-agent',
     sshAddCmdDefault: 'ssh-add',
-    sshCmd: 'ssh',
+    sshCmdDefault: 'ssh',
     gitCmdDefault: 'git'
 } : {
     // Assuming GitHub hosted `windows-*` runners for now
     homePath: os.homedir(),
     sshAgentCmdDefault: 'c://progra~1//git//usr//bin//ssh-agent.exe',
     sshAddCmdDefault: 'c://progra~1//git//usr//bin//ssh-add.exe',
+    sshCmd: 'c://progra~1//git//usr//bin//ssh.exe',
     gitCmdDefault: 'c://progra~1//git//bin//git.exe'
 };
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "cryptid-action-ssh-agent",
     "repository": "git@github.com:cryptidtech/ssh-agent.git",
     "description": "GitHub Action to set up ssh-agent with a private SSH key",
-    "version": "0.1.10",
+    "version": "0.1.11",
     "main": "index.js",
     "author": "webfactory GmbH <info@webfactory.de>",
     "license": "MIT",

diff --git a/paths.js b/paths.js
@@ -6,12 +6,13 @@ module.exports = (process.env['OS'] != 'Windows_NT') ? {
     homePath: os.userInfo().homedir,
     sshAgentCmdDefault: 'ssh-agent',
     sshAddCmdDefault: 'ssh-add',
-    sshCmd: 'ssh',
+    sshCmdDefault: 'ssh',
     gitCmdDefault: 'git'
 } : {
     // Assuming GitHub hosted `windows-*` runners for now
     homePath: os.homedir(),
     sshAgentCmdDefault: 'c://progra~1//git//usr//bin//ssh-agent.exe',
     sshAddCmdDefault: 'c://progra~1//git//usr//bin//ssh-add.exe',
+    sshCmd: 'c://progra~1//git//usr//bin//ssh.exe',
     gitCmdDefault: 'c://progra~1//git//bin//git.exe'
 };