From 6d285f5b6b29e2feb6bc12b67a37aac54a65b8e3 Mon Sep 17 00:00:00 2001 From: Matthias Pigulla Date: Fri, 12 Feb 2021 17:09:58 +0000 Subject: [PATCH] Try different home dir detection as suggested in #38 --- dist/index.js | 9 +++++++-- index.js | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dist/index.js b/dist/index.js index 173d8ea..8f07a29 100644 --- a/dist/index.js +++ b/dist/index.js @@ -118,12 +118,12 @@ exports.issueCommand = issueCommand; const core = __webpack_require__(470); const child_process = __webpack_require__(129); const fs = __webpack_require__(747); +const os = __webpack_require__(87); try { - const home = process.env['HOME']; + const home = os.homedir(); const homeSsh = home + '/.ssh'; - const privateKey = core.getInput('ssh-private-key'); if (!privateKey) { @@ -132,6 +132,11 @@ try { return; } + if (process.env['OS'] == 'Windows_NT') { + console.log('Preparing ssh-agent service on Windows'); + child_process.execSync('sc config ssh-agent start=demand', { stdio: 'inherit' }); + } + console.log(`Adding GitHub.com keys to ${homeSsh}/known_hosts`); fs.mkdirSync(homeSsh, { recursive: true }); fs.appendFileSync(`${homeSsh}/known_hosts`, '\ngithub.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==\n'); diff --git a/index.js b/index.js index 7ee6fe7..52dbb1c 100644 --- a/index.js +++ b/index.js @@ -1,12 +1,12 @@ const core = require('@actions/core'); const child_process = require('child_process'); const fs = require('fs'); +const os = require('os'); try { - const home = process.env['HOME']; + const home = os.homedir(); const homeSsh = home + '/.ssh'; - const privateKey = core.getInput('ssh-private-key'); if (!privateKey) { @@ -15,6 +15,11 @@ try { return; } + if (process.env['OS'] == 'Windows_NT') { + console.log('Preparing ssh-agent service on Windows'); + child_process.execSync('sc config ssh-agent start=demand', { stdio: 'inherit' }); + } + console.log(`Adding GitHub.com keys to ${homeSsh}/known_hosts`); fs.mkdirSync(homeSsh, { recursive: true }); fs.appendFileSync(`${homeSsh}/known_hosts`, '\ngithub.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==\n');