-
-
Notifications
You must be signed in to change notification settings - Fork 626
Fallback mechanism for the woff/woff2 dependencies #403
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
Changes from all commits
c273d93
2f5f9e0
fb0a271
03ad879
b61a4ca
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -135,19 +135,31 @@ fi | |
# sfntwoff-zopfli installed | ||
if ! [ -f "$SFNTWOFF_BIN" ] | ||
then | ||
echo "sfnt2woff-zopfli was not found on the path $SFNTWOFF_BIN. Please install all build dependencies with 'make build-with-dependencies', then attempt your build again." 1>&2 | ||
INSTALLFLAG=1 | ||
else | ||
echo "sfnt2woff-zopfli executable identified" | ||
if ! which sfnt2woff-zopfli | ||
then | ||
echo "sfnt2woff-zopfli was not found on the path $SFNTWOFF_BIN. Please install all build dependencies with 'make build-with-dependencies', then attempt your build again." 1>&2 | ||
INSTALLFLAG=1 | ||
else | ||
SFNTWOFF_BIN="sfnt2woff-zopfli" | ||
echo "sfnt2woff-zopfli executable identified" | ||
fi | ||
else | ||
echo "sfnt2woff-zopfli executable identified" | ||
fi | ||
|
||
# woff2 installed | ||
# woff2_compress installed | ||
if ! [ -f "$WOFF2_BIN" ] | ||
then | ||
echo "woff2_compress was not found on the path $WOFF2_BIN. Please install all build dependencies with 'make build-with-dependencies', then attempt your build again." 1>&2 | ||
INSTALLFLAG=1 | ||
else | ||
echo "woff2_compress executable identified" | ||
if ! which woff2_compress | ||
then | ||
echo "woff2_compress was not found on the path $SFNTWOFF_BIN. Please install all build dependencies with 'make build-with-dependencies', then attempt your build again." 1>&2 | ||
INSTALLFLAG=1 | ||
else | ||
WOFF2_BIN="woff2_compress" | ||
echo "woff2_compress executable identified" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. and here for woff2_compress |
||
fi | ||
else | ||
echo "woff2_compress executable identified" | ||
fi | ||
|
||
# if any of the dependency installs failed, exit and do not attempt build, notify user | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -93,6 +93,13 @@ if [ "$1" = "--install-dependencies" ] | |
cd "$CUR_DIR" || exit 1 | ||
fi | ||
|
||
# If the binary is not found, look if it is installed system-wide | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. or perhaps better to introduce it in these blocks. Somewhere so that it is clear in the standard output trail that a system installed version is being applied rather than the approach used with the build-with-dependencies target. I will do the same for the Python installs depending upon how we approach them with version pinning. |
||
if [ ! -x "$SFNTWOFF_BIN" ]; then | ||
SFNTWOFF_SYSWIDE=$(command -pv sfnt2woff-zopfli) | ||
if [ -x "$SFNTWOFF_SYSWIDE" ]; then | ||
SFNTWOFF_BIN=$SFNTWOFF_SYSWIDE | ||
fi | ||
fi | ||
|
||
if [ -f "$SFNTWOFF_BIN" ]; then | ||
echo "Beginning web font build with $SFNTWOFF" | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Possible to modify the stdout for users to explicitly indicate that they are building with the system installed version of sfnt2woff-zopfli?