From 6fc593776fe2e7fc3454429aba5e488fcb1ac120 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 1 Jul 2025 07:55:49 +0000 Subject: [PATCH 1/5] Initial plan From e0b4e3a316613d0961a330084a167971b0c2f45f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 1 Jul 2025 08:00:20 +0000 Subject: [PATCH 2/5] Update Linux setup scripts to allow Enter key as default confirmation (Y) Co-authored-by: waldekmastykarz <11164679+waldekmastykarz@users.noreply.github.com> --- scripts/setup-beta.sh | 4 ++-- scripts/setup.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/setup-beta.sh b/scripts/setup-beta.sh index 42622c09..9acd19de 100755 --- a/scripts/setup-beta.sh +++ b/scripts/setup-beta.sh @@ -21,13 +21,13 @@ echo "" if [ -t 0 ]; then # Terminal is interactive, prompt the user - read -p "Continue (y/n)? " -n1 -r response + read -p "Continue (Y/n)? " -r response else # Not interactive response='y' fi -if [[ "$response" != [yY] ]]; then +if [[ "$response" = [nN] ]]; then echo -e "\nExiting" exit 1 fi diff --git a/scripts/setup.sh b/scripts/setup.sh index 87f58ec1..a04a5b0d 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -20,13 +20,13 @@ echo "" if [ -t 0 ]; then # Terminal is interactive, prompt the user - read -p "Continue (y/n)? " -n1 -r response + read -p "Continue (Y/n)? " -r response else # Not interactive, set a default response response='y' fi -if [[ "$response" != [yY] ]]; then +if [[ "$response" = [nN] ]]; then echo -e "\nExiting" exit 1 fi From 5f71945e073498321725bf0293826d6b938d43fe Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 1 Jul 2025 11:26:47 +0000 Subject: [PATCH 3/5] Fix script logic to only continue on y, Y, or Enter - reject all other input Co-authored-by: waldekmastykarz <11164679+waldekmastykarz@users.noreply.github.com> --- scripts/setup-beta.sh | 2 +- scripts/setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/setup-beta.sh b/scripts/setup-beta.sh index 9acd19de..3545a389 100755 --- a/scripts/setup-beta.sh +++ b/scripts/setup-beta.sh @@ -27,7 +27,7 @@ else response='y' fi -if [[ "$response" = [nN] ]]; then +if [[ "$response" != "" && "$response" != [yY] ]]; then echo -e "\nExiting" exit 1 fi diff --git a/scripts/setup.sh b/scripts/setup.sh index a04a5b0d..2e1f3389 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -26,7 +26,7 @@ else response='y' fi -if [[ "$response" = [nN] ]]; then +if [[ "$response" != "" && "$response" != [yY] ]]; then echo -e "\nExiting" exit 1 fi From 697d821ba5a08581a4c3fc47af56dddad806c654 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 2 Jul 2025 07:11:41 +0000 Subject: [PATCH 4/5] Update PowerShell setup scripts to allow Enter key as default confirmation (Y) Co-authored-by: waldekmastykarz <11164679+waldekmastykarz@users.noreply.github.com> --- scripts/setup-beta.ps1 | 7 +++---- scripts/setup.ps1 | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/setup-beta.ps1 b/scripts/setup-beta.ps1 index 445164ac..0cd1630e 100644 --- a/scripts/setup-beta.ps1 +++ b/scripts/setup-beta.ps1 @@ -18,11 +18,10 @@ Write-Host "4. Configure Dev Proxy and its files as executable (Linux and macOS Write-Host "5. Configure new version notifications for the beta channel" Write-Host "6. Add the devproxy-beta directory to your PATH environment variable in `$PROFILE.CurrentUserAllHosts" Write-Host "" -Write-Host "Continue (y/n)? " -NoNewline -$response = [System.Console]::ReadKey().KeyChar +$response = Read-Host "Continue (Y/n)?" -if ($response -notin @('y', 'Y')) { - Write-Host "`nExiting" +if ($response -in @('n', 'N')) { + Write-Host "Exiting" exit 1 } diff --git a/scripts/setup.ps1 b/scripts/setup.ps1 index 96f9511f..e126daff 100644 --- a/scripts/setup.ps1 +++ b/scripts/setup.ps1 @@ -17,11 +17,10 @@ Write-Host "3. Unzip the release in the devproxy directory" Write-Host "4. Configure devproxy and its files as executable (Linux and macOS only)" Write-Host "5. Add the devproxy directory to your PATH environment variable in `$PROFILE.CurrentUserAllHosts" Write-Host "" -Write-Host "Continue (y/n)? " -NoNewline -$response = [System.Console]::ReadKey().KeyChar +$response = Read-Host "Continue (Y/n)?" -if ($response -notin @('y', 'Y')) { - Write-Host "`nExiting" +if ($response -in @('n', 'N')) { + Write-Host "Exiting" exit 1 } From 48421744da5ba8525f2883875e4af29b1f56510b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 2 Jul 2025 11:03:10 +0000 Subject: [PATCH 5/5] Update all setup scripts to require single key press and only accept Y/y/Enter Co-authored-by: waldekmastykarz <11164679+waldekmastykarz@users.noreply.github.com> --- scripts/setup-beta.ps1 | 8 +++++--- scripts/setup-beta.sh | 11 +++++------ scripts/setup.ps1 | 8 +++++--- scripts/setup.sh | 11 +++++------ 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/scripts/setup-beta.ps1 b/scripts/setup-beta.ps1 index 0cd1630e..a5fcb2cf 100644 --- a/scripts/setup-beta.ps1 +++ b/scripts/setup-beta.ps1 @@ -18,10 +18,12 @@ Write-Host "4. Configure Dev Proxy and its files as executable (Linux and macOS Write-Host "5. Configure new version notifications for the beta channel" Write-Host "6. Add the devproxy-beta directory to your PATH environment variable in `$PROFILE.CurrentUserAllHosts" Write-Host "" -$response = Read-Host "Continue (Y/n)?" +Write-Host "Continue (Y/n)? " -NoNewline +$key = [Console]::ReadKey($true) +$response = $key.KeyChar -if ($response -in @('n', 'N')) { - Write-Host "Exiting" +if ($response -notin @('Y', 'y', "`r")) { + Write-Host "`nExiting" exit 1 } diff --git a/scripts/setup-beta.sh b/scripts/setup-beta.sh index 3545a389..34ce521d 100755 --- a/scripts/setup-beta.sh +++ b/scripts/setup-beta.sh @@ -21,17 +21,16 @@ echo "" if [ -t 0 ]; then # Terminal is interactive, prompt the user - read -p "Continue (Y/n)? " -r response + read -p "Continue (Y/n)? " -n1 -r response + if [[ "$response" != "" && "$response" != [yY] && "$response" != $'\n' ]]; then + echo -e "\nExiting" + exit 1 + fi else # Not interactive response='y' fi -if [[ "$response" != "" && "$response" != [yY] ]]; then - echo -e "\nExiting" - exit 1 -fi - if [ -t 0 ]; then echo -e "\n" fi diff --git a/scripts/setup.ps1 b/scripts/setup.ps1 index e126daff..f6b2ca94 100644 --- a/scripts/setup.ps1 +++ b/scripts/setup.ps1 @@ -17,10 +17,12 @@ Write-Host "3. Unzip the release in the devproxy directory" Write-Host "4. Configure devproxy and its files as executable (Linux and macOS only)" Write-Host "5. Add the devproxy directory to your PATH environment variable in `$PROFILE.CurrentUserAllHosts" Write-Host "" -$response = Read-Host "Continue (Y/n)?" +Write-Host "Continue (Y/n)? " -NoNewline +$key = [Console]::ReadKey($true) +$response = $key.KeyChar -if ($response -in @('n', 'N')) { - Write-Host "Exiting" +if ($response -notin @('Y', 'y', "`r")) { + Write-Host "`nExiting" exit 1 } diff --git a/scripts/setup.sh b/scripts/setup.sh index 2e1f3389..8be6d47e 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -20,17 +20,16 @@ echo "" if [ -t 0 ]; then # Terminal is interactive, prompt the user - read -p "Continue (Y/n)? " -r response + read -p "Continue (Y/n)? " -n1 -r response + if [[ "$response" != "" && "$response" != [yY] && "$response" != $'\n' ]]; then + echo -e "\nExiting" + exit 1 + fi else # Not interactive, set a default response response='y' fi -if [[ "$response" != "" && "$response" != [yY] ]]; then - echo -e "\nExiting" - exit 1 -fi - if [ -t 0 ]; then echo -e "\n" fi