From 2323242ffedcff5fa068cba532e304e4855191f0 Mon Sep 17 00:00:00 2001 From: eleanorjboyd Date: Mon, 27 Jan 2025 10:53:19 -0800 Subject: [PATCH 1/2] switch to using python3 in the script for no-config debugging --- bundled/scripts/noConfigScripts/debugpy | 2 +- bundled/scripts/noConfigScripts/debugpy.bat | 2 +- bundled/scripts/noConfigScripts/debugpy.fish | 2 +- bundled/scripts/noConfigScripts/debugpy.ps1 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bundled/scripts/noConfigScripts/debugpy b/bundled/scripts/noConfigScripts/debugpy index 7b440d2c..1893a2cd 100755 --- a/bundled/scripts/noConfigScripts/debugpy +++ b/bundled/scripts/noConfigScripts/debugpy @@ -1,3 +1,3 @@ #! /bin/bash # Bash script -python $BUNDLED_DEBUGPY_PATH --listen 0 --wait-for-client $@ +python3 $BUNDLED_DEBUGPY_PATH --listen 0 --wait-for-client $@ diff --git a/bundled/scripts/noConfigScripts/debugpy.bat b/bundled/scripts/noConfigScripts/debugpy.bat index 25e3bf5f..109271c2 100755 --- a/bundled/scripts/noConfigScripts/debugpy.bat +++ b/bundled/scripts/noConfigScripts/debugpy.bat @@ -1,3 +1,3 @@ @echo off :: Bat script -python %BUNDLED_DEBUGPY_PATH% --listen 0 --wait-for-client %* +python3 %BUNDLED_DEBUGPY_PATH% --listen 0 --wait-for-client %* diff --git a/bundled/scripts/noConfigScripts/debugpy.fish b/bundled/scripts/noConfigScripts/debugpy.fish index 7319d863..5206b078 100755 --- a/bundled/scripts/noConfigScripts/debugpy.fish +++ b/bundled/scripts/noConfigScripts/debugpy.fish @@ -1,2 +1,2 @@ # Fish script -python $BUNDLED_DEBUGPY_PATH --listen 0 --wait-for-client $argv +python3 $BUNDLED_DEBUGPY_PATH --listen 0 --wait-for-client $argv diff --git a/bundled/scripts/noConfigScripts/debugpy.ps1 b/bundled/scripts/noConfigScripts/debugpy.ps1 index ebffa418..4c3d9c58 100755 --- a/bundled/scripts/noConfigScripts/debugpy.ps1 +++ b/bundled/scripts/noConfigScripts/debugpy.ps1 @@ -1,2 +1,2 @@ # PowerShell script -python $env:BUNDLED_DEBUGPY_PATH --listen 0 --wait-for-client $args +python3 $env:BUNDLED_DEBUGPY_PATH --listen 0 --wait-for-client $args From 0d5fe3169efb33853f6b030987bd671ea278652b Mon Sep 17 00:00:00 2001 From: eleanorjboyd Date: Mon, 27 Jan 2025 11:51:45 -0800 Subject: [PATCH 2/2] update python3 to python in some cases --- bundled/scripts/noConfigScripts/debugpy.bat | 2 +- bundled/scripts/noConfigScripts/debugpy.ps1 | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bundled/scripts/noConfigScripts/debugpy.bat b/bundled/scripts/noConfigScripts/debugpy.bat index 109271c2..25e3bf5f 100755 --- a/bundled/scripts/noConfigScripts/debugpy.bat +++ b/bundled/scripts/noConfigScripts/debugpy.bat @@ -1,3 +1,3 @@ @echo off :: Bat script -python3 %BUNDLED_DEBUGPY_PATH% --listen 0 --wait-for-client %* +python %BUNDLED_DEBUGPY_PATH% --listen 0 --wait-for-client %* diff --git a/bundled/scripts/noConfigScripts/debugpy.ps1 b/bundled/scripts/noConfigScripts/debugpy.ps1 index 4c3d9c58..945c5091 100755 --- a/bundled/scripts/noConfigScripts/debugpy.ps1 +++ b/bundled/scripts/noConfigScripts/debugpy.ps1 @@ -1,2 +1,6 @@ # PowerShell script -python3 $env:BUNDLED_DEBUGPY_PATH --listen 0 --wait-for-client $args +if ($PSVersionTable.OS -match "Windows") { + python $env:BUNDLED_DEBUGPY_PATH --listen 0 --wait-for-client $args +} else { + python3 $env:BUNDLED_DEBUGPY_PATH --listen 0 --wait-for-client $args +}