diff options
author | Nate Sesti <sestinj@gmail.com> | 2023-06-25 21:35:56 -0700 |
---|---|---|
committer | Nate Sesti <sestinj@gmail.com> | 2023-06-25 21:35:56 -0700 |
commit | 2caff9f639611a66d9e88ec6d84b36efe8327b91 (patch) | |
tree | 5f6eec8728e8297753ae123596bc210cdfffda80 | |
parent | 25eded3e2bb67bac3f05ed8fd724359b20e3d81b (diff) | |
parent | e429aa8f8543a3741913cf4ee4d0db41bef0dc5b (diff) | |
download | sncontinue-2caff9f639611a66d9e88ec6d84b36efe8327b91.tar.gz sncontinue-2caff9f639611a66d9e88ec6d84b36efe8327b91.tar.bz2 sncontinue-2caff9f639611a66d9e88ec6d84b36efe8327b91.zip |
Merge branch 'main' of https://github.com/continuedev/continue
-rw-r--r-- | continuedev/src/continuedev/core/config.py | 3 | ||||
-rw-r--r-- | extension/src/activation/environmentSetup.ts | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/continuedev/src/continuedev/core/config.py b/continuedev/src/continuedev/core/config.py index 01316f1b..ed5d785a 100644 --- a/continuedev/src/continuedev/core/config.py +++ b/continuedev/src/continuedev/core/config.py @@ -105,6 +105,9 @@ def load_global_config() -> ContinueConfig: return ContinueConfig() else: config_path = os.path.join(global_dir, 'config.json') + if not os.path.exists(config_path): + with open(config_path, 'w') as f: + json.dump(dict(ContinueConfig()), f) with open(config_path, 'r') as f: try: config_dict = json.load(f) diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts index 54c263bd..66e1c722 100644 --- a/extension/src/activation/environmentSetup.ts +++ b/extension/src/activation/environmentSetup.ts @@ -121,7 +121,7 @@ async function setupPythonEnv() { activateCmd, pipUpgradeCmd, `${pipCmd} install -r requirements.txt`, - ].join(" && "); + ].join(" ; "); const [, stderr] = await runCommand(installRequirementsCommand); if (stderr) { throw new Error(stderr); @@ -199,7 +199,7 @@ export async function startContinuePythonServer() { let command = `cd ${path.join( getExtensionUri().fsPath, "scripts" - )} && ${activateCmd} && cd .. && ${pythonCmd} -m scripts.run_continue_server`; + )} ; ${activateCmd} ; cd .. ; ${pythonCmd} -m scripts.run_continue_server`; return new Promise(async (resolve, reject) => { try { @@ -255,10 +255,10 @@ export async function downloadPython3() { throw new Error("python3 not found"); } else if (os === "linux") { command = - "sudo apt update && upgrade && sudo apt install python3 python3-pip"; + "sudo apt update ; upgrade ; sudo apt install python3 python3-pip"; } else if (os === "win32") { command = - "wget -O python_installer.exe https://www.python.org/ftp/python/3.11.3/python-3.11.3-amd64.exe && python_installer.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0"; + "wget -O python_installer.exe https://www.python.org/ftp/python/3.11.3/python-3.11.3-amd64.exe ; python_installer.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0"; pythonCmd = "python"; } |