Skip to content

Commit 4c1854b

Browse files
committed
Move env export script to .profile.d
1 parent 25e0753 commit 4c1854b

File tree

2 files changed

+37
-14
lines changed

2 files changed

+37
-14
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/usr/bin/env bash
2+
3+
# export the file path as a ENV
4+
CHROMIUM_PATH=${find ~+ -type f -name "chrome":-NULL}
5+
FIREFOX_PATH=${find ~+ -type f -name "firefox":-NULL}
6+
WEBKIT_PATH=${find ~+ -type f -name "pw_run.sh":-NULL} # see https://github.com/microsoft/playwright/issues/2923
7+
8+
echo "----> CHROMIUM_EXECUTABLE_PATH is $CHROMIUM_PATH"
9+
echo "----> FIREFOX_EXECUTABLE_PATH is $FIREFOX_PATH"
10+
echo "----> WEBKIT_EXECUTABLE_PATH is $WEBKIT_PATH"
11+
12+
if [ "$CHROMIUM_EXECUTABLE_PATH" != "NULL" ]; then
13+
export CHROMIUM_EXECUTABLE_PATH=$CHROMIUM_PATH
14+
fi
15+
16+
if [ "$FIREFOX_EXECUTABLE_PATH" != "NULL" ]; then
17+
export FIREFOX_EXECUTABLE_PATH=$FIREFOX_PATH
18+
fi
19+
20+
if [ "$WEBKIT_EXECUTABLE_PATH" != "NULL" ]; then
21+
export WEBKIT_EXECUTABLE_PATH=$WEBKIT_PATH
22+
fi

bin/compile

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,20 @@ set -e
66
BUILD_DIR=$1
77
ENV_DIR=$3
88

9+
export_env_dir() {
10+
acceptlist_regex='(BUILDPACK_BROWSERS_INSTALL_PATH|PLAYWRIGHT_BUILDPACK_BROWSERS)'
11+
denylist_regex='^(PATH|GIT_DIR|CPATH|CPPATH|LD_PRELOAD|LIBRARY_PATH)$'
12+
if [ -d "$ENV_DIR" ]; then
13+
for e in $(ls $ENV_DIR); do
14+
echo "$e" | grep -E "$acceptlist_regex" | grep -qvE "$denylist_regex" &&
15+
export "$e=$(cat $ENV_DIR/$e)"
16+
:
17+
done
18+
fi
19+
}
20+
21+
export_env_dir
22+
923
# modify the installation location
1024
if [ -z "$BUILDPACK_BROWSERS_INSTALL_PATH" ]; then
1125
BUILDPACK_BROWSERS_INSTALL_PATH="/browsers"
@@ -19,19 +33,6 @@ fi
1933
export PLAYWRIGHT_BROWSERS_PATH=$BUILD_DIR/$BUILDPACK_BROWSERS_INSTALL_PATH
2034
echo "-----> BROWSERS_INSTALL_PATH is $BUILDPACK_BROWSERS_INSTALL_PATH"
2135
echo "-----> Browsers will be installed in $PLAYWRIGHT_BROWSERS_PATH"
22-
echo "----->Installing Playwright executables (env: PLAYWRIGHT_BUILDPACK_BROWSERS) for ${SUPPORTED_BROWSERS//,/ }."
36+
echo "-----> Installing Playwright executables (env: PLAYWRIGHT_BUILDPACK_BROWSERS) for ${SUPPORTED_BROWSERS} (formatted value for command line is '${SUPPORTED_BROWSERS//,/ }')."
2337
playwright install ${SUPPORTED_BROWSERS//,/ }
2438
echo "-----> Installation done"
25-
26-
# export the file path as a ENV
27-
CHROMIUM_EXECUTABLE_PATH=./browsers/chromium-1091/chrome-linux/chrome
28-
# FIREFOX_EXECUTABLE_PATH=${find ~+ -type f -name "geckodriver"}
29-
# WEBKIT_EXECUTABLE_PATH=${find ~+ -type f -name "webkit"}
30-
31-
echo "----> CHROMIUM_EXECUTABLE_PATH is $CHROMIUM_EXECUTABLE_PATH"
32-
# echo "----> FIREFOX_EXECUTABLE_PATH is $FIREFOX_EXECUTABLE_PATH"
33-
# echo "----> WEBKIT_EXECUTABLE_PATH is $WEBKIT_EXECUTABLE_PATH"
34-
35-
if [ -v "$CHROMIUM_EXECUTABLE_PATH" ]; then
36-
echo $CHROMIUM_EXECUTABLE_PATH > $ENV_DIR/CHROMIUM_EXECUTABLE_PATH
37-
fi

0 commit comments

Comments
 (0)