From 032fc3847f6a79a88798579542192ab517c3d571 Mon Sep 17 00:00:00 2001 From: Reinier Criel Date: Thu, 6 Nov 2025 11:09:28 -0800 Subject: [PATCH] Fix args --- packages/safe-chain/bin/aikido-python.js | 2 +- packages/safe-chain/bin/aikido-python3.js | 2 +- packages/safe-chain/src/packagemanager/pip/pipSettings.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/safe-chain/bin/aikido-python.js b/packages/safe-chain/bin/aikido-python.js index e3d9046..8d19a9f 100644 --- a/packages/safe-chain/bin/aikido-python.js +++ b/packages/safe-chain/bin/aikido-python.js @@ -13,7 +13,7 @@ let argv = process.argv.slice(2); // If no args are passed, argv[0] and argv[1] are undefined, so this condition just evaluates to false and does not throw. if (argv[0] === '-m' && (argv[1] === 'pip' || argv[1] === 'pip3')) { setEcoSystem(ECOSYSTEM_PY); - setCurrentPipInvocation(argv[1] === 'pip3' ? PIP_INVOCATIONS.PY3_PIP : PIP_INVOCATIONS.PY_PIP); + setCurrentPipInvocation(argv[1] === 'pip3' ? PIP_INVOCATIONS.PY_PIP3 : PIP_INVOCATIONS.PY_PIP); initializePackageManager(PIP_PACKAGE_MANAGER); argv = argv.slice(2); var exitCode = await main(argv); diff --git a/packages/safe-chain/bin/aikido-python3.js b/packages/safe-chain/bin/aikido-python3.js index 8e16d6c..be96d6f 100644 --- a/packages/safe-chain/bin/aikido-python3.js +++ b/packages/safe-chain/bin/aikido-python3.js @@ -13,7 +13,7 @@ let argv = process.argv.slice(2); // If no args are passed, argv[0] and argv[1] are undefined, so this condition just evaluates to false and does not throw. if (argv[0] === '-m' && (argv[1] === 'pip' || argv[1] === 'pip3')) { setEcoSystem(ECOSYSTEM_PY); - setCurrentPipInvocation(argv[1] === 'pip3' ? PIP_INVOCATIONS.PY3_PIP : PIP_INVOCATIONS.PY_PIP); + setCurrentPipInvocation(argv[1] === 'pip3' ? PIP_INVOCATIONS.PY3_PIP3 : PIP_INVOCATIONS.PY3_PIP); initializePackageManager(PIP_PACKAGE_MANAGER); argv = argv.slice(2); var exitCode = await main(argv); diff --git a/packages/safe-chain/src/packagemanager/pip/pipSettings.js b/packages/safe-chain/src/packagemanager/pip/pipSettings.js index 2dd7929..2b2f6ad 100644 --- a/packages/safe-chain/src/packagemanager/pip/pipSettings.js +++ b/packages/safe-chain/src/packagemanager/pip/pipSettings.js @@ -6,7 +6,9 @@ export const PIP_INVOCATIONS = { PIP: { command: "pip", args: [] }, PIP3: { command: "pip3", args: [] }, PY_PIP: { command: "python", args: ["-m", "pip"] }, - PY3_PIP: { command: "python3", args: ["-m", "pip"] } + PY3_PIP: { command: "python3", args: ["-m", "pip"] }, + PY_PIP3: { command: "python", args: ["-m", "pip3"] }, + PY3_PIP3: { command: "python3", args: ["-m", "pip3"] } }; /** @@ -18,7 +20,6 @@ let currentInvocation = PIP_INVOCATIONS.PY3_PIP; // Default to python3 -m pip * @param {{ command: string, args: string[] }} invocation */ export function setCurrentPipInvocation(invocation) { - console.debug('[safe-chain debug] setCurrentPipInvocation:', invocation); currentInvocation = invocation; } @@ -26,6 +27,5 @@ export function setCurrentPipInvocation(invocation) { * @returns {{ command: string, args: string[] }} */ export function getCurrentPipInvocation() { - console.debug('[safe-chain debug] getCurrentPipInvocation:', currentInvocation); return currentInvocation; }