From 462385af1eab0ece2082d750f46f680f3498d9f1 Mon Sep 17 00:00:00 2001 From: PatrickBuTaxdoo Date: Thu, 20 Sep 2018 15:29:37 +0200 Subject: [PATCH 1/3] fixed #252 --- lib/pip.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pip.js b/lib/pip.js index 39fdb5ab..522983df 100644 --- a/lib/pip.js +++ b/lib/pip.js @@ -274,7 +274,7 @@ function installRequirements(targetFolder, serverless, options) { * @return {string} */ function dockerPathForWin(options, path) { - if (process.platform === 'win32' && options.dockerizePip) { + if (process.platform === 'win32') { return path.replace(/\\/g, '/'); } return quote_single(path); From caefd363f4288af32b3b7f6b36dbbbd8eaeec122 Mon Sep 17 00:00:00 2001 From: PatrickBuTaxdoo Date: Fri, 21 Sep 2018 10:34:15 +0200 Subject: [PATCH 2/3] better approach to fix #252 --- lib/pip.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/pip.js b/lib/pip.js index f4b74e0f..1fcb2c68 100644 --- a/lib/pip.js +++ b/lib/pip.js @@ -274,8 +274,10 @@ function installRequirements(targetFolder, serverless, options) { * @return {string} */ function dockerPathForWin(options, path) { - if (process.platform === 'win32') { - return `"${path.replace(/\\/g, '/')}"`; + if (process.platform === 'win32' && options.dockerizePip) { + return path.replace(/\\/g, '/'); + } else if (process.platform === 'win32' && !options.dockerizePip) { + return path; } return quote_single(path); } From 367d92f1a58d4345f48648f650d4c4b0a657fabe Mon Sep 17 00:00:00 2001 From: PatrickBuTaxdoo Date: Fri, 21 Sep 2018 11:34:12 +0200 Subject: [PATCH 3/3] fixed undone merge --- lib/pip.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pip.js b/lib/pip.js index 1fcb2c68..bc84b4d4 100644 --- a/lib/pip.js +++ b/lib/pip.js @@ -275,7 +275,7 @@ function installRequirements(targetFolder, serverless, options) { */ function dockerPathForWin(options, path) { if (process.platform === 'win32' && options.dockerizePip) { - return path.replace(/\\/g, '/'); + return `"${path.replace(/\\/g, '/')}"`; } else if (process.platform === 'win32' && !options.dockerizePip) { return path; }