yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 10:19:23 +02:00
Code Issues Releases Wiki Activity

GP-5703: Only require minor versions to match in auto-install.

Browse source
This commit is contained in:
Dan 2025-05-16 19:48:43 +00:00
parent f30aee4535
commit deadfe59a1
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Debug/Debugger-agent-gdb/data/debugger-launchers/ssh-gdb.ps1
View file

@ -57,14 +57,14 @@ are copied and installed.
NOTE: Automatic resolution will cause this session to terminate. When it has NOTE: Automatic resolution will cause this session to terminate. When it has
finished, try launching again. finished, try launching again.
"@ "Would you like to install 'ghidragdb==$version'?" "@ "Would you like to install 'ghidragdb>=$version'?"
if ($answer) { if ($answer) {
Write-Host "Copying Wheels to $Env:OPT_HOST" Write-Host "Copying Wheels to $Env:OPT_HOST"
Mitigate-Scp-PyModules "Debug/Debugger-rmi-trace" "Debug/Debugger-agent-gdb" Mitigate-Scp-PyModules "Debug/Debugger-rmi-trace" "Debug/Debugger-agent-gdb"
Write-Host "Installing Wheels into GDB's embedded Python" 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 $sshargs = Compute-Ssh-Args $arglist False
Start-Process -FilePath $sshargs[0] -ArgumentList $sshargs[1..$sshargs.Count] -NoNewWindow -Wait Start-Process -FilePath $sshargs[0] -ArgumentList $sshargs[1..$sshargs.Count] -NoNewWindow -Wait
} }

4
Ghidra/Debug/Debugger-agent-gdb/data/debugger-launchers/ssh-gdb.sh
View file

@ -57,7 +57,7 @@ version=$(get-ghidra-version)
function do-installation() { function do-installation() {
local -a pipargs 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 local -a sshargs
compute-ssh-args false "${pipargs[@]}" 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 NOTE: Automatic resolution will cause this session to terminate. When it has
finished, try launching again. 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" echo "Copying Wheels to $OPT_HOST"
mitigate-scp-pymodules "Debug/Debugger-rmi-trace" "Debug/Debugger-agent-gdb" mitigate-scp-pymodules "Debug/Debugger-rmi-trace" "Debug/Debugger-agent-gdb"

4
Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb.ps1
View file

@ -56,14 +56,14 @@ are copied and installed.
NOTE: Automatic resolution will cause this session to terminate. When it has NOTE: Automatic resolution will cause this session to terminate. When it has
finished, try launching again. finished, try launching again.
"@ "Would you like to install 'ghidralldb==$version'?" "@ "Would you like to install 'ghidralldb>=$version'?"
if ($answer) { if ($answer) {
Write-Host "Copying Wheels to $Env:OPT_HOST" Write-Host "Copying Wheels to $Env:OPT_HOST"
Mitigate-Scp-PyModules "Debug/Debugger-rmi-trace" "Debug/Debugger-agent-lldb" Mitigate-Scp-PyModules "Debug/Debugger-rmi-trace" "Debug/Debugger-agent-lldb"
Write-Host "Installing Wheels into LLDB's embedded Python" 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 $sshargs = Compute-Ssh-Args $arglist False
Start-Process -FilePath $sshargs[0] -ArgumentList $sshargs[1..$sshargs.Count] -NoNewWindow -Wait Start-Process -FilePath $sshargs[0] -ArgumentList $sshargs[1..$sshargs.Count] -NoNewWindow -Wait
} }

4
Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb.sh
View file

@ -56,7 +56,7 @@ version=$(get-ghidra-version)
function do-installation() { function do-installation() {
local -a pipargs 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 local -a sshargs
compute-ssh-args false "${pipargs[@]}" 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 NOTE: Automatic resolution may cause this session to terminate. When it has
finished, try launching again. 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" echo "Copying Wheels to $OPT_HOST"
mitigate-scp-pymodules "Debug/Debugger-rmi-trace" "Debug/Debugger-agent-lldb" mitigate-scp-pymodules "Debug/Debugger-rmi-trace" "Debug/Debugger-agent-lldb"

2
Ghidra/Debug/Debugger-rmi-trace/data/support/setuputils.ps1
View file

@ -12,7 +12,7 @@ function Find-App-Properties {
function Get-Ghidra-Version { function Get-Ghidra-Version {
$props = Find-App-Properties $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 return $m.Matches.Groups[1].Value
} }

2
Ghidra/Debug/Debugger-rmi-trace/data/support/setuputils.sh
View file

@ -29,7 +29,7 @@ find-app-properties() {
} }
get-ghidra-version() { 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 props=$(find-app-properties)
local version=$(cat "$props" | while read line; do local version=$(cat "$props" | while read line; do
if [[ $line =~ $app_ver_re ]]; then if [[ $line =~ $app_ver_re ]]; then