Prepended $VMDIR to all image paths for consistency#325
Open
lmlsna wants to merge 1 commit intofoxlet:masterfrom
Open
Prepended $VMDIR to all image paths for consistency#325lmlsna wants to merge 1 commit intofoxlet:masterfrom
lmlsna wants to merge 1 commit intofoxlet:masterfrom
Conversation
Author
|
This looks duplicative with #327 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
There is a
$VMDIRvariable that defaults to "$PWD" and defines the base directory for the$OVMF. The BaseSystem and ESP partitons have no prefix however, so 2 of the 4 paths are getting$PWDincluded explicitly and the other two assume it implicitly. This will break if $VMDIR is defined as a different directory then the project root, or if the script is run from outside the project root.I just prepended
$VMDIRto those paths as well be consistent if$VMDIRis redefined.Also:
It might be safer to use
$(dirname $0)instead of$PWDas a default, since what we probably want is "the same directory as where this script is" and not necessarily "the directory the user ran this from." But I didn't change that in this pull request.