NixiN/ssh-agent-action
2
0
Fork 0
mirror of https://github.com/webfactory/ssh-agent.git synced 2024-10-16 16:27:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use SSH_AUTH_SOCK in following ssh-add invocations

Browse source
This commit is contained in:
Matthias Pigulla 2021-03-01 10:59:34 +00:00
parent 88bcf9af86
commit 7d6e731f4a
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dist/index.js vendored
View file

@ -166,6 +166,7 @@ try {
const matches = /^(SSH_AUTH_SOCK|SSH_AGENT_PID)=(.*); export \1/.exec(lines[lineNumber]) const matches = /^(SSH_AUTH_SOCK|SSH_AGENT_PID)=(.*); export \1/.exec(lines[lineNumber])
if (matches && matches.length > 0) { if (matches && matches.length > 0) {
core.exportVariable(matches[1], matches[2]) core.exportVariable(matches[1], matches[2])
process.env[matches[1]] = matches[2]; // use variables for ssh-add below
} }
} }
@ -195,7 +196,7 @@ try {
if (isWindows) { if (isWindows) {
child_process.execFileSync('ssh-add', [keyFile], { env: { ...process.env, ...{ 'DISPLAY': 'fake', 'SSH_PASS': token, 'SSH_ASKPASS': 'D:\\a\\ssh-agent\\ssh-agent\\askpass.exe' } } }); child_process.execFileSync('ssh-add', [keyFile], { env: { ...process.env, ...{ 'DISPLAY': 'fake', 'SSH_PASS': token, 'SSH_ASKPASS': 'D:\\a\\ssh-agent\\ssh-agent\\askpass.exe' } } });
} else { } else {
child_process.execFileSync('ssh-add', [keyFile], { input: token }); child_process.execFileSync('ssh-add', [keyFile], { env: process.env, input: token });
} }
output.toString().split(/\r?\n/).forEach(function(key) { output.toString().split(/\r?\n/).forEach(function(key) {

3
index.js
View file

@ -49,6 +49,7 @@ try {
const matches = /^(SSH_AUTH_SOCK|SSH_AGENT_PID)=(.*); export \1/.exec(lines[lineNumber]) const matches = /^(SSH_AUTH_SOCK|SSH_AGENT_PID)=(.*); export \1/.exec(lines[lineNumber])
if (matches && matches.length > 0) { if (matches && matches.length > 0) {
core.exportVariable(matches[1], matches[2]) core.exportVariable(matches[1], matches[2])
process.env[matches[1]] = matches[2]; // use variables for ssh-add below
} }
} }
@ -78,7 +79,7 @@ try {
if (isWindows) { if (isWindows) {
child_process.execFileSync('ssh-add', [keyFile], { env: { ...process.env, ...{ 'DISPLAY': 'fake', 'SSH_PASS': token, 'SSH_ASKPASS': 'D:\\a\\ssh-agent\\ssh-agent\\askpass.exe' } } }); child_process.execFileSync('ssh-add', [keyFile], { env: { ...process.env, ...{ 'DISPLAY': 'fake', 'SSH_PASS': token, 'SSH_ASKPASS': 'D:\\a\\ssh-agent\\ssh-agent\\askpass.exe' } } });
} else { } else {
child_process.execFileSync('ssh-add', [keyFile], { input: token }); child_process.execFileSync('ssh-add', [keyFile], { env: process.env, input: token });
} }
output.toString().split(/\r?\n/).forEach(function(key) { output.toString().split(/\r?\n/).forEach(function(key) {