Fix archives that are wrapped in a directory #11
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gorkem
force-pushed
the
fix-wrapped
branch
4 times, most recently
from
4e09472
to
53e31cc
Compare
Fixes the case if kit binary is wrapped in a directory. Also fixes the markdownlint issues.
amisevsk
reviewed
May 3, 2024
Comment on lines
+78
to
+96
| const extractedDir = path.dirname(extractedPath) | ||
| const files = fs.readdirSync(extractedDir, { | ||
| withFileTypes: true, | ||
| recursive: true | ||
| }) | ||
| const kitExecutable = files.filter( | ||
| file => file.isFile() && file.name === getExecutableBinaryName() | ||
| ) | ||
| if (kitExecutable.length === 0) { | ||
| throw new Error( | ||
| `Failed to find executable binary in extracted archive: ${archive}` | ||
| ) | ||
| } | ||
| // In some cases, the extracted binary is in a subdirectory of the extracted archive | ||
| // In this case, move the binary to the root of the extracted archive | ||
| ghCore.debug( | ||
| `Checking if extracted binary is in a subdirectory for ${kitExecutable[0].name} on path ${kitExecutable[0].path}` | ||
| ) | ||
| if (kitExecutable[0].path === extractedPath) { |
There was a problem hiding this comment.
This appears to still not work:
- In the files.filter() call, won't checking
file => isFile()prevent getting any dirs (assuming you want to match the wrapping directory) - Checking
file.name === getExecutableBinaryName()also might not work; in the case of wrapped dirs on macos, the dir name iskit-darwin-amd64or similar (i.e. notkit). On windows, the binary name iskit.exewhich will never match a dir.
Testing locally, I'm seeing failures (in both case, ::error::Failed to find executable binary in extracted archive: <longname>):
- With latest, the jozu-bin dir contains
/var/[...]/jozu-bin ├── LICENSE ├── README.md └── kit - With v0.1.3, the jozu-bin dir contains
/var/[...]/jozu-bin └── kitops-darwin-arm64 ├── LICENSE ├── README.md └── kit
There was a problem hiding this comment.
Looking locally, I don't know if
const extractedDir = path.dirname(extractedPath)
is correct -- on my system, extractedPath is /var/[...]/T/jozu-bin, so taking the dirname gives /var/[...]/T/, which will not contain the extracted files.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes the case if kit binary is wrapped in a directory.