From deadfe59a11fa075ec2c9a905eef05d0c5bc8331 Mon Sep 17 00:00:00 2001 From: Dan <46821332+nsadeveloper789@users.noreply.github.com> Date: Fri, 16 May 2025 19:48:43 +0000 Subject: [PATCH] GP-5703: Only require minor versions to match in auto-install. --- .../Debugger-agent-gdb/data/debugger-launchers/ssh-gdb.ps1 | 4 ++-- .../Debugger-agent-gdb/data/debugger-launchers/ssh-gdb.sh | 4 ++-- .../Debugger-agent-lldb/data/debugger-launchers/ssh-lldb.ps1 | 4 ++-- .../Debugger-agent-lldb/data/debugger-launchers/ssh-lldb.sh | 4 ++-- Ghidra/Debug/Debugger-rmi-trace/data/support/setuputils.ps1 | 2 +- Ghidra/Debug/Debugger-rmi-trace/data/support/setuputils.sh | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Ghidra/Debug/Debugger-agent-gdb/data/debugger-launchers/ssh-gdb.ps1 b/Ghidra/Debug/Debugger-agent-gdb/data/debugger-launchers/ssh-gdb.ps1 index 9900c4a0ab..cc6474cde5 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/data/debugger-launchers/ssh-gdb.ps1 +++ b/Ghidra/Debug/Debugger-agent-gdb/data/debugger-launchers/ssh-gdb.ps1 @@ -57,14 +57,14 @@ are copied and installed. NOTE: Automatic resolution will cause this session to terminate. When it has finished, try launching again. -"@ "Would you like to install 'ghidragdb==$version'?" +"@ "Would you like to install 'ghidragdb>=$version'?" if ($answer) { Write-Host "Copying Wheels to $Env:OPT_HOST" Mitigate-Scp-PyModules "Debug/Debugger-rmi-trace" "Debug/Debugger-agent-gdb" Write-Host "Installing Wheels into GDB's embedded Python" - $arglist = Compute-Gdb-PipInstall-Args "'-f'" "os.environ['HOME']" "'ghidragdb==$version'" + $arglist = Compute-Gdb-PipInstall-Args "'-f'" "os.environ['HOME']" "'ghidragdb>=$version'" $sshargs = Compute-Ssh-Args $arglist False Start-Process -FilePath $sshargs[0] -ArgumentList $sshargs[1..$sshargs.Count] -NoNewWindow -Wait } diff --git a/Ghidra/Debug/Debugger-agent-gdb/data/debugger-launchers/ssh-gdb.sh b/Ghidra/Debug/Debugger-agent-gdb/data/debugger-launchers/ssh-gdb.sh index 17977f17ed..070feab61d 100755 --- a/Ghidra/Debug/Debugger-agent-gdb/data/debugger-launchers/ssh-gdb.sh +++ b/Ghidra/Debug/Debugger-agent-gdb/data/debugger-launchers/ssh-gdb.sh @@ -57,7 +57,7 @@ version=$(get-ghidra-version) function do-installation() { local -a pipargs - compute-gdb-pipinstall-args "'-f'" "os.environ['HOME']" "'ghidragdb==$version'" + compute-gdb-pipinstall-args "'-f'" "os.environ['HOME']" "'ghidragdb>=$version'" local -a sshargs compute-ssh-args false "${pipargs[@]}" @@ -90,7 +90,7 @@ are copied and installed. NOTE: Automatic resolution will cause this session to terminate. When it has finished, try launching again. -" "Would you like to install 'ghidragdb==$version'?"; then +" "Would you like to install 'ghidragdb>=$version'?"; then echo "Copying Wheels to $OPT_HOST" mitigate-scp-pymodules "Debug/Debugger-rmi-trace" "Debug/Debugger-agent-gdb" diff --git a/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb.ps1 b/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb.ps1 index d260cfc65a..4ddc7bf771 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb.ps1 +++ b/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb.ps1 @@ -56,14 +56,14 @@ are copied and installed. NOTE: Automatic resolution will cause this session to terminate. When it has finished, try launching again. -"@ "Would you like to install 'ghidralldb==$version'?" +"@ "Would you like to install 'ghidralldb>=$version'?" if ($answer) { Write-Host "Copying Wheels to $Env:OPT_HOST" Mitigate-Scp-PyModules "Debug/Debugger-rmi-trace" "Debug/Debugger-agent-lldb" Write-Host "Installing Wheels into LLDB's embedded Python" - $arglist = Compute-Lldb-PipInstall-Args "'-f'" "os.environ['HOME']" "'ghidralldb==$version'" + $arglist = Compute-Lldb-PipInstall-Args "'-f'" "os.environ['HOME']" "'ghidralldb>=$version'" $sshargs = Compute-Ssh-Args $arglist False Start-Process -FilePath $sshargs[0] -ArgumentList $sshargs[1..$sshargs.Count] -NoNewWindow -Wait } diff --git a/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb.sh b/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb.sh index be4d8e64f8..48a1b033fd 100755 --- a/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb.sh +++ b/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb.sh @@ -56,7 +56,7 @@ version=$(get-ghidra-version) function do-installation() { local -a pipargs - compute-lldb-pipinstall-args "'-f'" "os.environ['HOME']" "'ghidralldb==$version'" + compute-lldb-pipinstall-args "'-f'" "os.environ['HOME']" "'ghidralldb>=$version'" local -a sshargs compute-ssh-args false "${pipargs[@]}" @@ -89,7 +89,7 @@ are copied and installed. NOTE: Automatic resolution may cause this session to terminate. When it has finished, try launching again. -" "Would you like to install 'ghidralldb==$version'?"; then +" "Would you like to install 'ghidralldb>=$version'?"; then echo "Copying Wheels to $OPT_HOST" mitigate-scp-pymodules "Debug/Debugger-rmi-trace" "Debug/Debugger-agent-lldb" diff --git a/Ghidra/Debug/Debugger-rmi-trace/data/support/setuputils.ps1 b/Ghidra/Debug/Debugger-rmi-trace/data/support/setuputils.ps1 index 6046a06905..b4e050f88d 100644 --- a/Ghidra/Debug/Debugger-rmi-trace/data/support/setuputils.ps1 +++ b/Ghidra/Debug/Debugger-rmi-trace/data/support/setuputils.ps1 @@ -12,7 +12,7 @@ function Find-App-Properties { function Get-Ghidra-Version { $props = Find-App-Properties - $m = Get-Content $props | Select-String -Pattern "application\.version=(.*)" + $m = Get-Content $props | Select-String -Pattern "application\.version=([0-9]*\.[0-9]*)\.?.*" return $m.Matches.Groups[1].Value } diff --git a/Ghidra/Debug/Debugger-rmi-trace/data/support/setuputils.sh b/Ghidra/Debug/Debugger-rmi-trace/data/support/setuputils.sh index b1e9610e51..747b0d453e 100644 --- a/Ghidra/Debug/Debugger-rmi-trace/data/support/setuputils.sh +++ b/Ghidra/Debug/Debugger-rmi-trace/data/support/setuputils.sh @@ -29,7 +29,7 @@ find-app-properties() { } get-ghidra-version() { - local app_ver_re='application\.version=(.*)' + local app_ver_re='application\.version=([0-9]*\.[0-9]*)\.?.*' local props=$(find-app-properties) local version=$(cat "$props" | while read line; do if [[ $line =~ $app_ver_re ]]; then