Skip to content
Snippets Groups Projects
Commit a2ec392e authored by François  LAURENT's avatar François LAURENT
Browse files

bugfix with trailing arguments

parent 988a5487
No related branches found
No related tags found
No related merge requests found
Pipeline #100195 passed
......@@ -36,13 +36,14 @@ function Call1 {
$args = $args -split ' '
$cmd = $args[0]
$path = Convert-Path $args[1]
$args = $args[2..$args.GetUpperBound(0)]
$extraargs = $args[2..($args.count - 1)]
if ($cmd -eq 'open') {
$runargs = '-p', '9284:9284', '-i'
}
$parentdir = Split-Path -Parent $path
$filename = Split-Path -Leaf $path
docker run $runargs -v ${parentdir}:/data $LARVATAGGER_IMAGE $cmd /data/$filename $args
Write-Host "docker run $runargs -v ${parentdir}:/data $LARVATAGGER_IMAGE $cmd /data/$filename $extraargs"
docker run $runargs -v ${parentdir}:/data $LARVATAGGER_IMAGE $cmd /data/$filename $extraargs
}
Switch ($args[0])
......@@ -72,6 +73,7 @@ Switch ($args[0])
docker run $LARVATAGGER_IMAGE --version
}
'--update' {
Write-Host "docker pull flaur/larvatagger:latest"
docker pull flaur/larvatagger:latest
}
'open' {
......@@ -97,7 +99,9 @@ Switch ($args[0])
New-Item -Path $modelsdir -ItemType 'directory'
}
$taggername = Split-Path -Leaf $taggerpath
docker run --mount "type=bind,src=$modelsdir,dst=/app/$TAGGING_BACKEND/models" -v ${parentdir}:/data $LARVATAGGER_IMAGE train /app/$TAGGING_BACKEND /data/$dirname $taggername
$extraargs = $args[3..($args.count - 1)]
Write-Host "docker run --mount `"type=bind,src=$modelsdir,dst=/app/$TAGGING_BACKEND/models`" -v ${parentdir}:/data $LARVATAGGER_IMAGE train /app/$TAGGING_BACKEND /data/$dirname $taggername $extraargs"
docker run --mount "type=bind,src=$modelsdir,dst=/app/$TAGGING_BACKEND/models" -v ${parentdir}:/data $LARVATAGGER_IMAGE train /app/$TAGGING_BACKEND /data/$dirname $taggername $extraargs
}
'predict' {
$path = Convert-Path $args[1]
......@@ -112,6 +116,8 @@ Switch ($args[0])
}
$parentdir = Split-Path -Parent $path
$filename = Split-Path -Leaf $path
docker run $runargs -v ${parentdir}:/data $LARVATAGGER_IMAGE predict /app/$TAGGING_BACKEND $taggername /data/$filename
$extraargs = $args[3..($args.count - 1)]
Write-Host "docker run $runargs -v ${parentdir}:/data $LARVATAGGER_IMAGE predict /app/$TAGGING_BACKEND $taggername /data/$filename $extraargs"
docker run $runargs -v ${parentdir}:/data $LARVATAGGER_IMAGE predict /app/$TAGGING_BACKEND $taggername /data/$filename $extraargs
}
}
......@@ -280,7 +280,7 @@ function main(args=ARGS; exit_on_error=true)
@info "The server is ready at http://127.0.0.1:$(port)"
end
if verbose
@info "Press Ctrl+D to stop the server"
@info "Press Ctrl+D to stop the server (or Ctrl+C if in PowerShell)"
end
return server
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment