Fix scripts/* include paths #89
Merged
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
kenguest
requested changes
Jul 11, 2019
* The scripts/ directory itself should appear in include_path if we're relying on it to source pearcmd from within peclcmd, else we'll include the system pearcmd. * The root directory (parent of scripts/) should always be in include_path on a raw checkout.
LukeCarrier
force-pushed
the
scripts-include-path
branch
from
5fd2483
to
114d596
Compare
|
Changes made as requested @kenguest 😁 |
kenguest
added a commit
that referenced
this pull request
Jul 12, 2019
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.
I was confused by why my PECL-specific changes didn't seem to be doing anything until I realised that
peclcmd.phpdoesn't specify an absolute path forpearcmd.php, instead falling back toinclude_path. If PEAR is installed on the system the include_path will by default include/usr/share/php, resulting in us incorrectly(?) including the installed version rather than the "raw" one in the checkout.I also noticed that only
.appears ininclude_path, not specifically the root directory of the checkout. This means executing e.g.../pear/scripts/pecl.sh buildfrom within a PECL extension directory will include the system PEAR files rather than the raw checkout.From the commit log:
relying on it to source pearcmd from within peclcmd, else we'll
include the system pearcmd.
include_path on a raw checkout.