diff --git a/dist/cleanup.js b/dist/cleanup.js index 7e478b7..18202e4 100644 --- a/dist/cleanup.js +++ b/dist/cleanup.js @@ -2824,9 +2824,7 @@ const os = __webpack_require__(87); const core = __webpack_require__(470); const defaults = (process.env['OS'] != 'Windows_NT') ? { - // Use getent() system call, since this is what ssh does; makes a difference in Docker-based - // Action runs, where $HOME is different from the pwent - homePath: os.userInfo().homedir, + homePath: os.homedir(), sshAgentCmdDefault: 'ssh-agent', sshAddCmdDefault: 'ssh-add', gitCmdDefault: 'git' diff --git a/dist/index.js b/dist/index.js index 3f288c7..5be2d35 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2898,9 +2898,7 @@ const os = __webpack_require__(87); const core = __webpack_require__(470); const defaults = (process.env['OS'] != 'Windows_NT') ? { - // Use getent() system call, since this is what ssh does; makes a difference in Docker-based - // Action runs, where $HOME is different from the pwent - homePath: os.userInfo().homedir, + homePath: os.homedir(), sshAgentCmdDefault: 'ssh-agent', sshAddCmdDefault: 'ssh-add', gitCmdDefault: 'git' diff --git a/paths.js b/paths.js index f440579..7966262 100644 --- a/paths.js +++ b/paths.js @@ -1,29 +1,30 @@ -const os = require('os'); -const core = require('@actions/core'); +const os = require("os"); +const core = require("@actions/core"); -const defaults = (process.env['OS'] != 'Windows_NT') ? { - // We use os.userInfo() rather than os.homedir(), since it uses the getpwuid() system call to get the user's home directory (see https://nodejs.org/api/os.html#osuserinfooptions). - // This mimics the way openssh derives the home directory for locating config files (see https://github.com/openssh/openssh-portable/blob/826483d51a9fee60703298bbf839d9ce37943474/ssh.c#L710); - // Makes a difference in Docker-based Action runs, when $HOME is different from what getpwuid() returns (which is based on the entry in /etc/passwd) - homePath: os.userInfo().homedir, - sshAgentCmdDefault: 'ssh-agent', - sshAddCmdDefault: 'ssh-add', - 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', - gitCmdDefault: 'c://progra~1//git//bin//git.exe' -}; +const defaults = + process.env["OS"] != "Windows_NT" + ? { + homePath: os.homedir(), + sshAgentCmdDefault: "ssh-agent", + sshAddCmdDefault: "ssh-add", + 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", + gitCmdDefault: "c://progra~1//git//bin//git.exe", + }; -const sshAgentCmdInput = core.getInput('ssh-agent-cmd'); -const sshAddCmdInput = core.getInput('ssh-add-cmd'); -const gitCmdInput = core.getInput('git-cmd'); +const sshAgentCmdInput = core.getInput("ssh-agent-cmd"); +const sshAddCmdInput = core.getInput("ssh-add-cmd"); +const gitCmdInput = core.getInput("git-cmd"); module.exports = { - homePath: defaults.homePath, - sshAgentCmd: sshAgentCmdInput !== '' ? sshAgentCmdInput : defaults.sshAgentCmdDefault, - sshAddCmd: sshAddCmdInput !== '' ? sshAddCmdInput : defaults.sshAddCmdDefault, - gitCmd: gitCmdInput !== '' ? gitCmdInput : defaults.gitCmdDefault, + homePath: defaults.homePath, + sshAgentCmd: + sshAgentCmdInput !== "" ? sshAgentCmdInput : defaults.sshAgentCmdDefault, + sshAddCmd: sshAddCmdInput !== "" ? sshAddCmdInput : defaults.sshAddCmdDefault, + gitCmd: gitCmdInput !== "" ? gitCmdInput : defaults.gitCmdDefault, };