Skip to content

Commit

Permalink
Merge pull request #1179 from mandiant/magika-pin
Browse files Browse the repository at this point in the history
Pin magika version to fix pip issue
  • Loading branch information
Ana06 authored Dec 11, 2024
2 parents cc52a27 + daf5e69 commit 754a7a1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion packages/common.vm/common.vm.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
<metadata>
<id>common.vm</id>
<version>0.0.0.20241122</version>
<version>0.0.0.20241209</version>
<description>Common libraries for VM-packages</description>
<authors>Mandiant</authors>
</metadata>
Expand Down
4 changes: 3 additions & 1 deletion packages/common.vm/tools/vm.common/vm.common.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -1762,10 +1762,12 @@ function VM-Install-With-Pip {
[Parameter(Mandatory=$true)]
[string] $category,
[Parameter(Mandatory=$false)]
[string] $version = "", # Version using pip format, example: "==0.5.0"
[Parameter(Mandatory=$false)]
[string] $arguments = "--help"
)
try {
VM-Pip-Install $toolName
VM-Pip-Install $toolName$version
$executablePath = "$(where.exe $toolName)"

VM-Install-Shortcut $toolName $category $executablePath -consoleApp $true -arguments $arguments
Expand Down
4 changes: 2 additions & 2 deletions packages/magika.vm/magika.vm.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
<metadata>
<id>magika.vm</id>
<version>0.0.0.20240607</version>
<version>0.5.0</version>
<authors>Yanick Fratantonio, Luca Invernizzi, Marina Zhang, Giancarlo Metitieri, Thomas Kurt, Francois Galilee, Alexandre Petit-Bianco, Loua Farah, Ange Albertini, Elie Bursztein</authors>
<description>Magika is an AI powered file type detection tool that uses deep learning to provide accurate detection.</description>
<dependencies>
<dependency id="common.vm" version="0.0.0.20240607" />
<dependency id="common.vm" version="0.0.0.20241209" />
<dependency id="python3.vm" />
</dependencies>
</metadata>
Expand Down
3 changes: 2 additions & 1 deletion packages/magika.vm/tools/chocolateyinstall.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ Import-Module vm.common -Force -DisableNameChecking

$toolName = 'magika'
$category = 'File Information'
$version = "==0.5.0"

VM-Install-With-Pip -toolName $toolName -category $category
VM-Install-With-Pip -toolName $toolName -category $category -version $version

0 comments on commit 754a7a1

Please sign in to comment.