Skip to content

Commit

Permalink
Make set-env.sh script work on MacOS (#4704)
Browse files Browse the repository at this point in the history
The script depends on the grep program and had a hard coded path that
didn't match on MacOS. No need for an absolute path, so just remove.

Fix suggested by sdondley.

Fixes #4696
  • Loading branch information
patrickbkr committed Jan 8, 2022
1 parent f77fda7 commit 1969691
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tools/build/binary-release/assets/Linux/scripts/set-env.sh
Expand Up @@ -39,7 +39,7 @@ RAKUDO_PATH0="$DIR/bin"
RAKUDO_PATH1="$DIR/share/perl6/site/bin"
STUFF_DONE=false
for RPATH in $RAKUDO_PATH1 $RAKUDO_PATH0 ; do
if echo "$NEW_PATH" | /bin/grep -vEq "(^|:)$RPATH($|:)" ; then
if echo "$NEW_PATH" | grep -vEq "(^|:)$RPATH($|:)" ; then
NEW_PATH="$RPATH:$NEW_PATH"
STUFF_DONE=true
fi
Expand Down
2 changes: 1 addition & 1 deletion tools/build/binary-release/assets/MacOS/scripts/set-env.sh
Expand Up @@ -39,7 +39,7 @@ RAKUDO_PATH0="$DIR/bin"
RAKUDO_PATH1="$DIR/share/perl6/site/bin"
STUFF_DONE=false
for RPATH in $RAKUDO_PATH1 $RAKUDO_PATH0 ; do
if echo "$NEW_PATH" | /bin/grep -vEq "(^|:)$RPATH($|:)" ; then
if echo "$NEW_PATH" | grep -vEq "(^|:)$RPATH($|:)" ; then
NEW_PATH="$RPATH:$NEW_PATH"
STUFF_DONE=true
fi
Expand Down

0 comments on commit 1969691

Please sign in to comment.