Skip to content

Commit 0594334

Browse files
authored
Merge pull request #1258 from sara-rn/git-pip-install-try-catc
Add try-catch to VM-Pip-Install
2 parents b86fdc2 + 8c481fa commit 0594334

File tree

4 files changed

+20
-19
lines changed

4 files changed

+20
-19
lines changed

packages/common.vm/common.vm.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
33
<metadata>
44
<id>common.vm</id>
5-
<version>0.0.0.20250122</version>
5+
<version>0.0.0.20250124</version>
66
<description>Common libraries for VM-packages</description>
77
<authors>Mandiant</authors>
88
</metadata>

packages/common.vm/tools/vm.common/vm.common.psm1

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1752,12 +1752,16 @@ function VM-Pip-Install {
17521752
param (
17531753
[string]$libraries # Comma-separated list of libraries to install, example: "flare-capa", "flare-capa,tabulate"
17541754
)
1755-
# Create output file to log python module installation details
1756-
$outputFile = VM-New-Install-Log ${Env:VM_COMMON_DIR}
1755+
try {
1756+
# Create output file to log python module installation details
1757+
$outputFile = VM-New-Install-Log ${Env:VM_COMMON_DIR}
17571758

1758-
ForEach ($library in $libraries.Split(",")) {
1759-
# Ignore warning with `-W ignore` to avoid warnings like deprecation to fail the installation
1760-
Invoke-Expression "py -3.10 -W ignore -m pip install $library --disable-pip-version-check 2>&1 >> $outputFile"
1759+
ForEach ($library in $libraries.Split(",")) {
1760+
# Ignore warning with `-W ignore` to avoid warnings like deprecation to fail the installation
1761+
Invoke-Expression "py -3.10 -W ignore -m pip install $library --disable-pip-version-check 2>&1 >> $outputFile"
1762+
}
1763+
} catch {
1764+
VM-Write-Log-Exception $_
17611765
}
17621766
}
17631767

packages/ida.plugin.hashdb.vm/ida.plugin.hashdb.vm.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
33
<metadata>
44
<id>ida.plugin.hashdb.vm</id>
5-
<version>1.10.0</version>
5+
<version>1.10.0.20250124</version>
66
<authors>OALabs</authors>
77
<description>Malware string hash lookup plugin for IDA Pro</description>
88
<dependencies>
Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
$ErrorActionPreference = 'Stop'
22
Import-Module vm.common -Force -DisableNameChecking
33

4-
try {
5-
# Install requirements: https://github.com/OALabs/hashdb-ida/blob/1.10.0/requirements.txt
6-
VM-Pip-Install requests
7-
8-
$pluginName = 'hashdb.py'
9-
$pluginUrl = 'https://github.com/OALabs/hashdb-ida/releases/download/1.10.0/hashdb.py'
10-
$pluginSha256 = '8d153281ce9feccf00eb63c56fe0fbcc9534ce005635a91565c2340fbf5db651'
11-
12-
VM-Install-IDA-Plugin -pluginName $pluginName -pluginUrl $pluginUrl -pluginSha256 $pluginSha256
13-
} catch {
14-
VM-Write-Log-Exception $_
15-
}
4+
5+
# Install requirements: https://github.com/OALabs/hashdb-ida/blob/1.10.0/requirements.txt
6+
VM-Pip-Install requests
7+
8+
$pluginName = 'hashdb.py'
9+
$pluginUrl = 'https://github.com/OALabs/hashdb-ida/releases/download/1.10.0/hashdb.py'
10+
$pluginSha256 = '8d153281ce9feccf00eb63c56fe0fbcc9534ce005635a91565c2340fbf5db651'
11+
12+
VM-Install-IDA-Plugin -pluginName $pluginName -pluginUrl $pluginUrl -pluginSha256 $pluginSha256

0 commit comments

Comments
 (0)