fix: no asar support (#4), renamed directories (#5) and check if we need to duplicate asar's (#2) #8
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
…eed to duplicate asar's (#1)
NielsLeenheer
changed the title
entry-asar/has-asar.js
Outdated
| process._archPath = require.resolve('../app-x64.asar'); | ||
| } | ||
|
|
||
| require(process._archPath); |
There was a problem hiding this comment.
prettier should have done this for us but can you add the trailing new line in here?
entry-asar/no-asar.js
Outdated
| process._archPath = require.resolve('../app-x64'); | ||
| } | ||
|
|
||
| require(process._archPath); |
There was a problem hiding this comment.
Same here, missing new line
|
Fixed! Added a new line to both entry-asar files. |
MarshallOfSound
approved these changes
Nov 19, 2020
|
🎉 This PR is included in version 1.0.1 🎉 The release is available on: Your semantic-release bot 📦🚀 |
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 all issues from #4, #5 and #2.
The fix for #4 was pretty simple. Just prepare two separate entry-asar files. One for asar's and one in case there is no asar. And copy the right one for each situation.
The fix for #5 was renaming the directories to
app-x64andapp-arm64instead ofx64.appandarm64.app. I've also renamed the asar files, to match this new naming scheme.For #2, I now check if the asar or app directories are identical. If they are, then we can leave the exiting asar or app directory just in place in the tmp directory. No need to rename and create and entry-asar. In case of an asar, I use the already existing sha function to check if they are identical. In case of an app directory I use a new dependency
dir-compareto check the directories by size and content.