Skip to content

Commit

Permalink
🐛 Fixing up the addon to use the updated location for bin (konveyor#80)
Browse files Browse the repository at this point in the history
Moving the non system binaries to /usr/local/bin

---------

Signed-off-by: Shawn Hurley <shawn@hurley.page>
  • Loading branch information
shawn-hurley authored Mar 27, 2024
1 parent db75db5 commit 92300c9
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions cmd/analyzer.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type Analyzer struct {
// Run analyzer.
func (r *Analyzer) Run() (b *builder.Issues, err error) {
output := path.Join(Dir, "report.yaml")
cmd := command.New("/usr/bin/konveyor-analyzer")
cmd := command.New("/usr/local/bin/konveyor-analyzer")
cmd.Options, err = r.options(output)
if err != nil {
return
Expand Down Expand Up @@ -79,7 +79,7 @@ type DepAnalyzer struct {
// Run analyzer.
func (r *DepAnalyzer) Run() (b *builder.Deps, err error) {
output := path.Join(Dir, "deps.yaml")
cmd := command.New("/usr/bin/konveyor-analyzer-dep")
cmd := command.New("/usr/local/bin/konveyor-analyzer-dep")
cmd.Options, err = r.options(output)
if err != nil {
return
Expand Down
4 changes: 2 additions & 2 deletions hack/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Set environment variables:
- The `TOKEN` must be set when auth is enabled in the hub.

The addon runs analyzer (CLI) commands:
- /usr/bin/konveyor-analyzer
- /usr/bin/konveyor-analyzer-dep
- /usr/local/bin/konveyor-analyzer
- /usr/local/bin/konveyor-analyzer-dep

These commands have dependencies that can be complicated to install and
most developers won't want to install them in their development environment.
Expand Down
2 changes: 1 addition & 1 deletion hack/konveyor-analyzer
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ do
done

docker run \
--entrypoint konveyor-analyzer \
--entrypoint /usr/local/bin/konveyor-analyzer \
-v ${addon}:${addon} \
${image} \
"${params[@]}"
Expand Down
2 changes: 1 addition & 1 deletion hack/konveyor-analyzer-dep
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ do
params+=("$p")
done
docker run \
--entrypoint /usr/bin/konveyor-analyzer-dep \
--entrypoint /usr/local/bin/konveyor-analyzer-dep \
-v ${addon}:${addon} \
${image} \
"${params[@]}"
Expand Down
4 changes: 2 additions & 2 deletions settings.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[
{
"name": "go",
"binaryPath": "/usr/bin/generic-external-provider",
"binaryPath": "/usr/local/bin/generic-external-provider",
"initConfig": [
{
"analysisMode": "full",
"providerSpecificConfig": {
"name": "go",
"lspServerPath": "/root/go/bin/gopls",
"dependencyProviderPath": "/usr/bin/golang-dependency-provider"
"dependencyProviderPath": "/usr/local/bin/golang-dependency-provider"
}
}
]
Expand Down

0 comments on commit 92300c9

Please sign in to comment.