Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 Remove "bin" from zls rename location #86

Merged
merged 2 commits into from
Jun 21, 2024

Conversation

KeithBrown39423
Copy link
Contributor

Remove bin because the zls zip has the files in the root location of the zip, not in the "bin" directory.

Remove bin because the zls zip has the files in the root location of the zip, not in the "bin" directory.
@KeithBrown39423
Copy link
Contributor Author

Solution for #85

@tristanisham tristanisham self-assigned this Jun 20, 2024
@tristanisham tristanisham added the bug Something isn't working label Jun 20, 2024
cli/install.go Outdated
@@ -388,7 +388,7 @@ func (z *ZVM) InstallZls(version string) error {
if err := ExtractBundle(tempDir.Name(), filepath.Join(z.baseDir, version)); err != nil {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replace the second argument of ExtractBundle with versionPath.

cli/install.go Outdated
@@ -388,7 +388,7 @@ func (z *ZVM) InstallZls(version string) error {
if err := ExtractBundle(tempDir.Name(), filepath.Join(z.baseDir, version)); err != nil {
log.Fatal(err)
}
if err := os.Rename(filepath.Join(versionPath, "bin", filename), filepath.Join(versionPath, filename)); err != nil {
if err := os.Rename(filepath.Join(versionPath, filename), filepath.Join(versionPath, filename)); err != nil {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this entire conditional block. It's now a no-op.

@tristanisham tristanisham merged commit 210ff08 into tristanisham:master Jun 21, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants